Merge branch 'main' into main

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Flake8
+8de95676e0fd89f2326b3953488ab66ff29cd2d0
+# Format with Black
+53a7e3500437a9fd5826bc04758f7116bd7e52dc
+# Format the C code with ClangFormat
+46b7e86bab79450ec0a2866c6c0c679afb659d17

.github/workflows/cifuzz.yml

@@ -42,13 +42,13 @@ jobs:
         language: python
         dry-run: false
     - name: Upload New Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
         path: ./out/artifacts
     - name: Upload Legacy Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: steps.run.outcome == 'success'
       with:
         name: crash

.github/workflows/lint.yml

@@ -2,6 +2,9 @@ name: Lint
 
 on: [push, pull_request, workflow_dispatch]
 
+env:
+  FORCE_COLOR: 1
+
 permissions:
   contents: read
 
@@ -46,3 +49,6 @@ jobs:
       run: tox -e lint
       env:
         PRE_COMMIT_COLOR: always
+
+    - name: Mypy
+      run: tox -e mypy

.github/workflows/system-info.py

@@ -6,6 +6,8 @@ This sort of info is missing from GitHub Actions.
 Requested here:
 https://github.com/actions/virtual-environments/issues/79
 """
+from __future__ import annotations
+
 import os
 import platform
 import sys

.github/workflows/test-cygwin.yml

@@ -132,7 +132,7 @@ jobs:
           dash.exe -c "mkdir -p Tests/errors"
 
       - name: Upload errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: errors

.github/workflows/test-windows.yml

@@ -190,7 +190,7 @@ jobs:
       shell: bash
 
     - name: Upload errors
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: errors

.github/workflows/test.yml

@@ -112,7 +112,7 @@ jobs:
         mkdir -p Tests/errors
 
     - name: Upload errors
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: errors

.pre-commit-config.yaml

@@ -1,17 +1,17 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.1.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.11.0
+    rev: 23.12.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.7.6
     hooks:
     - id: bandit
       args: [--severity-level=high]
@@ -42,7 +42,7 @@ repos:
         exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/
 
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v0.9.0
+    rev: v0.9.1
     hooks:
       - id: sphinx-lint
 

.readthedocs.yml

@@ -5,7 +5,7 @@ formats: [pdf]
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3"
 
 python:
   install:

CHANGES.rst

@@ -5,6 +5,30 @@ Changelog (Pillow)
 10.2.0 (unreleased)
 -------------------
 
+- Fix incorrect color blending for overlapping glyphs #7497
+  [ZachNagengast, nulano, radarhere]
+
+- Attempt memory mapping when tile args is a string #7565
+  [radarhere]
+
+- Fill identical pixels with transparency in subsequent frames when saving GIF #7568
+  [radarhere]
+
+- Corrected duration when combining multiple GIF frames into single frame #7521
+  [radarhere]
+
+- Handle disposing GIF background from outside palette #7515
+  [radarhere]
+
+- Seek past the data when skipping a PSD layer #7483
+  [radarhere]
+
+- Import plugins relative to the module #7576
+  [deliangyang, jaxx0n]
+
+- Translate encoder error codes to strings; deprecate ``ImageFile.raise_oserror()`` #7609
+  [bgilbert, radarhere]
+
 - Support reading BC4U and DX10 BC1 images #6486
   [REDxEYE, radarhere, hugovk]
 

Tests/32bit_segfault_check.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+from __future__ import annotations
 
 import sys
 

Tests/bench_cffi_access.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import time
 
 from PIL import PyAccess

Tests/check_fli_oob.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+from __future__ import annotations
 
 from PIL import Image
 

Tests/check_fli_overflow.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import Image
 
 TEST_FILE = "Tests/images/fli_overflow.fli"

Tests/check_icns_dos.py

@@ -1,5 +1,6 @@
 # Tests potential DOS of IcnsImagePlugin with 0 length block.
 # Run from anywhere that PIL is importable.
+from __future__ import annotations
 
 from io import BytesIO
 

Tests/check_imaging_leaks.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/check_j2k_dos.py

@@ -1,5 +1,6 @@
 # Tests potential DOS of Jpeg2kImagePlugin with 0 length block.
 # Run from anywhere that PIL is importable.
+from __future__ import annotations
 
 from io import BytesIO
 

Tests/check_j2k_leaks.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from io import BytesIO
 
 import pytest

Tests/check_j2k_overflow.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/check_jp2_overflow.py

@@ -12,6 +12,7 @@
 # the output should be empty. There may be python issues
 # in the valgrind especially if run in a debug python
 # version.
+from __future__ import annotations
 
 
 from PIL import Image

Tests/check_jpeg_leaks.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from io import BytesIO
 
 import pytest

Tests/check_large_memory.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 import pytest

Tests/check_large_memory_numpy.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 import pytest

Tests/check_libtiff_segfault.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/check_png_dos.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import zlib
 from io import BytesIO
 

Tests/check_release_notes.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 from pathlib import Path
 

Tests/check_wheel.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 from PIL import features

Tests/conftest.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 
 

Tests/createfontdatachunk.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+from __future__ import annotations
 import base64
 import os
 

Tests/fonts/LICENSE.txt

@@ -2,7 +2,6 @@
 NotoNastaliqUrdu-Regular.ttf and NotoSansSymbols-Regular.ttf, from https://github.com/googlei18n/noto-fonts
 NotoSans-Regular.ttf, from https://www.google.com/get/noto/
 NotoSansJP-Thin.otf, from https://www.google.com/get/noto/help/cjk/
-NotoColorEmoji.ttf, from https://github.com/googlefonts/noto-emoji
 AdobeVFPrototype.ttf, from https://github.com/adobe-fonts/adobe-variable-font-prototype
 TINY5x3GX.ttf, from http://velvetyne.fr/fonts/tiny
 ArefRuqaa-Regular.ttf, from https://github.com/google/fonts/tree/master/ofl/arefruqaa
@@ -25,3 +24,5 @@ FreeMono.ttf is licensed under GPLv3.
 10x20-ISO8859-1.pcf, from https://packages.ubuntu.com/xenial/xfonts-base
 
 "Public domain font.  Share and enjoy."
+
+CBDTTestFont.ttf and EBDTTestFont.ttf from https://github.com/nulano/font-tests are public domain.

Tests/helper.py

@@ -1,6 +1,7 @@
 """
 Helper functions.
 """
+from __future__ import annotations
 
 import logging
 import os

Tests/oss-fuzz/fuzz_font.py

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 
 
 import atheris

Tests/oss-fuzz/fuzz_pillow.py

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 
 
 import atheris

Tests/oss-fuzz/fuzzers.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 import warnings
 

Tests/oss-fuzz/test_fuzzers.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import subprocess
 import sys
 

Tests/test_000_sanity.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import Image
 
 

Tests/test_binary.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import _binary
 
 

Tests/test_bmp_reference.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import warnings
 

Tests/test_box_blur.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, ImageFilter

Tests/test_color_lut.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from array import array
 
 import pytest

Tests/test_core_resources.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 import pytest

Tests/test_decompression_bomb.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/test_deprecate.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import _deprecate

Tests/test_features.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 import re
 

Tests/test_file_apng.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, ImageSequence, PngImagePlugin

Tests/test_file_blp.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/test_file_bmp.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 
 import pytest

Tests/test_file_bufrstub.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import BufrStubImagePlugin, Image

Tests/test_file_container.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import ContainerIO, Image

Tests/test_file_cur.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from io import BytesIO
 
 import pytest

Tests/test_file_dcx.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 
 import pytest

Tests/test_file_dds.py

@@ -1,4 +1,5 @@
 """Test DdsImagePlugin"""
+from __future__ import annotations
 from io import BytesIO
 
 import pytest

Tests/test_file_eps.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 
 import pytest

Tests/test_file_fits.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from io import BytesIO
 
 import pytest

Tests/test_file_fli.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 
 import pytest

Tests/test_file_fpx.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image

Tests/test_file_ftex.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import FtexImagePlugin, Image

Tests/test_file_gbr.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import GbrImagePlugin, Image

Tests/test_file_gd.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import GdImageFile, UnidentifiedImageError

Tests/test_file_gif.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 from io import BytesIO
 
@@ -217,6 +218,27 @@ def test_optimize_if_palette_can_be_reduced_by_half():
             assert len(reloaded.palette.palette) // 3 == colors
 
 
+def test_full_palette_second_frame(tmp_path):
+    out = str(tmp_path / "temp.gif")
+    im = Image.new("P", (1, 256))
+
+    full_palette_im = Image.new("P", (1, 256))
+    for i in range(256):
+        full_palette_im.putpixel((0, i), i)
+    full_palette_im.palette = ImagePalette.ImagePalette(
+        "RGB", bytearray(i // 3 for i in range(768))
+    )
+    full_palette_im.palette.dirty = 1
+
+    im.save(out, save_all=True, append_images=[full_palette_im])
+
+    with Image.open(out) as reloaded:
+        reloaded.seek(1)
+
+        for i in range(256):
+            reloaded.getpixel((0, i)) == i
+
+
 def test_roundtrip(tmp_path):
     out = str(tmp_path / "temp.gif")
     im = hopper()
@@ -856,7 +878,14 @@ def test_identical_frames(tmp_path):
 
 
 @pytest.mark.parametrize(
-    "duration", ([1000, 1500, 2000, 4000], (1000, 1500, 2000, 4000), 8500)
+    "duration",
+    (
+        [1000, 1500, 2000],
+        (1000, 1500, 2000),
+        # One more duration than the number of frames
+        [1000, 1500, 2000, 4000],
+        1500,
+    ),
 )
 def test_identical_frames_to_single_frame(duration, tmp_path):
     out = str(tmp_path / "temp.gif")
@@ -872,7 +901,7 @@ def test_identical_frames_to_single_frame(duration, tmp_path):
         assert reread.n_frames == 1
 
         # Assert that the new duration is the total of the identical frames
-        assert reread.info["duration"] == 8500
+        assert reread.info["duration"] == 4500
 
 
 def test_loop_none(tmp_path):
@@ -1142,6 +1171,12 @@ def test_rgba_transparency(tmp_path):
         assert_image_equal(hopper("P").convert("RGB"), reloaded)
 
 
+def test_background_outside_palettte(tmp_path):
+    with Image.open("Tests/images/background_outside_palette.gif") as im:
+        im.seek(1)
+        assert im.info["background"] == 255
+
+
 def test_bbox(tmp_path):
     out = str(tmp_path / "temp.gif")
 

Tests/test_file_gimpgradient.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import GimpGradientFile, ImagePalette
 
 

Tests/test_file_gimppalette.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL.GimpPaletteFile import GimpPaletteFile

Tests/test_file_gribstub.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import GribStubImagePlugin, Image

Tests/test_file_hdf5stub.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Hdf5StubImagePlugin, Image

Tests/test_file_icns.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 import os
 import warnings

Tests/test_file_ico.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 import os
 

Tests/test_file_im.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import filecmp
 import warnings
 

Tests/test_file_imt.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 
 import pytest

Tests/test_file_iptc.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 from io import BytesIO, StringIO
 

Tests/test_file_jpeg.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import re
 import warnings

Tests/test_file_jpeg2k.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import re
 from io import BytesIO

Tests/test_file_libtiff.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import base64
 import io
 import itertools

Tests/test_file_libtiff_small.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from io import BytesIO
 
 from PIL import Image

Tests/test_file_mcidas.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, McIdasImagePlugin

Tests/test_file_mic.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, ImagePalette

Tests/test_file_mpo.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 from io import BytesIO
 

Tests/test_file_msp.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 
 import pytest

Tests/test_file_palm.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os.path
 import subprocess
 

Tests/test_file_pcd.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import Image
 
 

Tests/test_file_pcx.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, ImageFile, PcxImagePlugin

Tests/test_file_pdf.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import io
 import os
 import os.path

Tests/test_file_pixar.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 
 from PIL import Image, PixarImagePlugin

Tests/test_file_png.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import re
 import sys
 import warnings