Merge branch 'main' into setuptools_scm

.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

CHANGES.rst

@@ -5,6 +5,21 @@ Changelog (Pillow)
 10.2.0 (unreleased)
 -------------------
 
+- 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]
 

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/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
 import pytest
 
 from PIL import CurImagePlugin, Image

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

Tests/test_file_ppm.py

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

Tests/test_file_psd.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import warnings
 
 import pytest
@@ -111,6 +112,11 @@ def test_rgba():
         assert_image_equal_tofile(im, "Tests/images/imagedraw_square.png")
 
 
+def test_layer_skip():
+    with Image.open("Tests/images/five_channels.psd") as im:
+        assert im.n_frames == 1
+
+
 def test_icc_profile():
     with Image.open(test_file) as im:
         assert "icc_profile" in im.info

Tests/test_file_qoi.py

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

Tests/test_file_sgi.py

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

Tests/test_file_spider.py

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

Tests/test_file_sun.py

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

Tests/test_file_tar.py

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

Tests/test_file_tga.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 from glob import glob
 from itertools import product

Tests/test_file_tiff.py

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

Tests/test_file_tiff_metadata.py

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

Tests/test_file_wal.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import WalImageFile
 
 from .helper import assert_image_equal_tofile

Tests/test_file_webp.py

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

Tests/test_file_webp_alpha.py

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

Tests/test_file_webp_animated.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import pytest
 from packaging.version import parse as parse_version
 

Tests/test_file_webp_lossless.py

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

Tests/test_file_webp_metadata.py

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

Tests/test_file_wmf.py

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

Tests/test_file_xbm.py

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

Tests/test_file_xpm.py

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

Tests/test_file_xvthumb.py

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

Tests/test_font_bdf.py

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

Tests/test_font_crash.py

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

Tests/test_font_leaks.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from PIL import Image, ImageDraw, ImageFont
 
 from .helper import PillowLeakTestCase, skip_unless_feature