Merge branch 'main' into stdlib-src

Author: radarhere

Tests/benchmarks.py

@@ -868,7 +868,8 @@ def test_quantize_to_palette(
     size: tuple[int, int],
 ) -> None:
     if isinstance(source_type, pathlib.Path):
-        im = Image.open(source_type).convert("RGB").resize(size)
+        with Image.open(source_type) as source_im:
+            im = source_im.convert("RGB").resize(size)
     elif source_type == "synthetic":
         im = make_pillow_image("RGB", size)
     if palette_type == "exact":

Tests/helper.py

@@ -154,15 +154,6 @@ def assert_not_all_same(items: Sequence[Any], msg: str | None = None) -> None:
     assert items.count(items[0]) != len(items), msg
 
 
-def assert_tuple_approx_equal(
-    actuals: Sequence[int], targets: tuple[int, ...], threshold: int, msg: str
-) -> None:
-    """Tests if actuals has values within threshold from targets"""
-    for i, target in enumerate(targets):
-        if not (target - threshold <= actuals[i] <= target + threshold):
-            pytest.fail(msg + ": " + repr(actuals) + " != " + repr(targets))
-
-
 def timeout_unless_slower_valgrind(timeout: float) -> pytest.MarkDecorator:
     if "PILLOW_VALGRIND_TEST" in os.environ:
         return pytest.mark.pil_noop_mark()
@@ -344,13 +335,4 @@ def is_win32() -> bool:
 
 
 def is_pypy() -> bool:
-    return hasattr(sys, "pypy_translation_info")
-
-
-class CachedProperty:
-    def __init__(self, func: Callable[[Any], Any]) -> None:
-        self.func = func
-
-    def __get__(self, instance: Any, cls: type[Any] | None = None) -> Any:
-        result = instance.__dict__[self.func.__name__] = self.func(instance)
-        return result
+    return sys.implementation.name == "pypy"

Tests/test_file_apng.py

@@ -299,6 +299,30 @@ def test_apng_mode() -> None:
     assert im_rgba.getpixel((64, 32)) == (0, 0, 255, 128)
 
 
+def test_apng_save_different_palettes(tmp_path: Path) -> None:
+    # APNG does not support multiple palettes
+    test_file = tmp_path / "temp.png"
+    red = Image.new("P", (1, 1), (255, 0, 0))
+    green = Image.new("P", (1, 1), (0, 255, 0))
+    red.save(test_file, save_all=True, append_images=[green])
+
+    with Image.open(test_file) as reloaded:
+        # So the frames must be converted to another mode
+        assert reloaded.mode == "RGB"
+        assert reloaded.getpixel((0, 0)) == (255, 0, 0)
+
+        reloaded.seek(1)
+        assert reloaded.mode == "RGB"
+        assert reloaded.getpixel((0, 0)) == (0, 255, 0)
+
+    # Test that RGBA palettes result in an RGBA image
+    green = Image.new("L", (1, 1))
+    green.putpalette([], "RGBA")
+    red.save(test_file, save_all=True, append_images=[green])
+    with Image.open(test_file) as reloaded:
+        assert reloaded.mode == "RGBA"
+
+
 def test_apng_chunk_errors() -> None:
     with Image.open("Tests/images/apng/chunk_no_actl.png") as im:
         assert isinstance(im, PngImagePlugin.PngImageFile)

Tests/test_image.py

@@ -674,6 +674,23 @@ def test_remap_palette(self) -> None:
             with pytest.raises(ValueError):
                 im_hopper.remap_palette([])
 
+    @pytest.mark.parametrize("palette_mode", ("RGB", "RGBA"))
+    def test_remap_palette_source_palette(self, palette_mode: str) -> None:
+        # When source_palette is provided, mode is inferred from length.
+        # 768 entries should be detected as a 256-entry RGB palette
+        # 1024 entries should be detected as a 256-entry RGBA palette
+        im = Image.new("P", (1, 1))
+        source_palette = bytes(
+            entry for entry in range(256) for channel in range(len(palette_mode))
+        )
+        im_remapped = im.remap_palette(list(range(256)), source_palette)
+
+        palette = im_remapped.palette
+        assert palette is not None
+        assert len(palette.colors) == 256
+        assert palette.mode == palette_mode
+        assert palette.palette == source_palette
+
     def test_remap_palette_transparency(self) -> None:
         im = Image.new("P", (1, 2), (0, 0, 0))
         im.putpixel((0, 1), (255, 0, 0))

Tests/test_image_paste.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
+from functools import cached_property
+
 import pytest
 
 from PIL import Image
 
-from .helper import CachedProperty, assert_image_equal
+from .helper import assert_image_equal
 
 
 class TestImagingPaste:
@@ -45,7 +47,7 @@ def assert_9points_paste(
         im.paste(im2, mask)
         self.assert_9points_image(im, expected)
 
-    @CachedProperty
+    @cached_property
     def mask_1(self) -> Image.Image:
         mask = Image.new("1", (self.size, self.size))
         px = mask.load()
@@ -55,11 +57,11 @@ def mask_1(self) -> Image.Image:
                 px[y, x] = (x + y) % 2
         return mask
 
-    @CachedProperty
+    @cached_property
     def mask_L(self) -> Image.Image:
         return self.gradient_L.transpose(Image.Transpose.ROTATE_270)
 
-    @CachedProperty
+    @cached_property
     def gradient_L(self) -> Image.Image:
         gradient = Image.new("L", (self.size, self.size))
         px = gradient.load()
@@ -69,7 +71,7 @@ def gradient_L(self) -> Image.Image:
                 px[y, x] = (x + y) % 255
         return gradient
 
-    @CachedProperty
+    @cached_property
     def gradient_RGB(self) -> Image.Image:
         return Image.merge(
             "RGB",
@@ -80,7 +82,7 @@ def gradient_RGB(self) -> Image.Image:
             ],
         )
 
-    @CachedProperty
+    @cached_property
     def gradient_LA(self) -> Image.Image:
         return Image.merge(
             "LA",
@@ -90,7 +92,7 @@ def gradient_LA(self) -> Image.Image:
             ],
         )
 
-    @CachedProperty
+    @cached_property
     def gradient_RGBA(self) -> Image.Image:
         return Image.merge(
             "RGBA",
@@ -102,7 +104,7 @@ def gradient_RGBA(self) -> Image.Image:
             ],
         )
 
-    @CachedProperty
+    @cached_property
     def gradient_RGBa(self) -> Image.Image:
         return Image.merge(
             "RGBa",

Tests/test_imageops.py

@@ -8,7 +8,6 @@
     assert_image_equal,
     assert_image_similar,
     assert_image_similar_tofile,
-    assert_tuple_approx_equal,
     hopper,
 )
 
@@ -291,33 +290,15 @@ def test_colorize_2color() -> None:
     im_test = ImageOps.colorize(im_l, "red", "green")
 
     # Test output image (2-color)
-    left = (0, 1)
-    middle = (127, 1)
-    right = (255, 1)
-    value = im_test.getpixel(left)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (255, 0, 0),
-        threshold=1,
-        msg="black test pixel incorrect",
-    )
-    value = im_test.getpixel(middle)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (127, 63, 0),
-        threshold=1,
-        msg="mid test pixel incorrect",
-    )
-    value = im_test.getpixel(right)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (0, 127, 0),
-        threshold=1,
-        msg="white test pixel incorrect",
-    )
+    assert im_test.getpixel((0, 1)) == pytest.approx(
+        (255, 0, 0), abs=1
+    ), "black test pixel incorrect"
+    assert im_test.getpixel((127, 1)) == pytest.approx(
+        (127, 63, 0), abs=1
+    ), "mid test pixel incorrect"
+    assert im_test.getpixel((255, 1)) == pytest.approx(
+        (0, 127, 0), abs=1
+    ), "white test pixel incorrect"
 
 
 def test_colorize_2color_offset() -> None:
@@ -333,33 +314,15 @@ def test_colorize_2color_offset() -> None:
     )
 
     # Test output image (2-color) with offsets
-    left = (25, 1)
-    middle = (75, 1)
-    right = (125, 1)
-    value = im_test.getpixel(left)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (255, 0, 0),
-        threshold=1,
-        msg="black test pixel incorrect",
-    )
-    value = im_test.getpixel(middle)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (127, 63, 0),
-        threshold=1,
-        msg="mid test pixel incorrect",
-    )
-    value = im_test.getpixel(right)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (0, 127, 0),
-        threshold=1,
-        msg="white test pixel incorrect",
-    )
+    assert im_test.getpixel((25, 1)) == pytest.approx(
+        (255, 0, 0), abs=1
+    ), "black test pixel incorrect"
+    assert im_test.getpixel((75, 1)) == pytest.approx(
+        (127, 63, 0), abs=1
+    ), "mid test pixel incorrect"
+    assert im_test.getpixel((125, 1)) == pytest.approx(
+        (0, 127, 0), abs=1
+    ), "white test pixel incorrect"
 
 
 def test_colorize_3color_offset() -> None:
@@ -381,46 +344,21 @@ def test_colorize_3color_offset() -> None:
     )
 
     # Test output image (3-color) with offsets
-    left = (25, 1)
-    left_middle = (75, 1)
-    middle = (100, 1)
-    right_middle = (150, 1)
-    right = (225, 1)
-    value = im_test.getpixel(left)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (255, 0, 0),
-        threshold=1,
-        msg="black test pixel incorrect",
-    )
-    value = im_test.getpixel(left_middle)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (127, 0, 127),
-        threshold=1,
-        msg="low-mid test pixel incorrect",
-    )
-    value = im_test.getpixel(middle)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(value, (0, 0, 255), threshold=1, msg="mid incorrect")
-    value = im_test.getpixel(right_middle)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (0, 63, 127),
-        threshold=1,
-        msg="high-mid test pixel incorrect",
-    )
-    value = im_test.getpixel(right)
-    assert isinstance(value, tuple)
-    assert_tuple_approx_equal(
-        value,
-        (0, 127, 0),
-        threshold=1,
-        msg="white test pixel incorrect",
-    )
+    assert im_test.getpixel((25, 1)) == pytest.approx(
+        (255, 0, 0), abs=1
+    ), "black test pixel incorrect"
+    assert im_test.getpixel((75, 1)) == pytest.approx(
+        (127, 0, 127), abs=1
+    ), "low-mid test pixel incorrect"
+    assert im_test.getpixel((100, 1)) == pytest.approx(
+        (0, 0, 255), abs=1
+    ), "mid incorrect"
+    assert im_test.getpixel((150, 1)) == pytest.approx(
+        (0, 63, 127), abs=1
+    ), "high-mid test pixel incorrect"
+    assert im_test.getpixel((225, 1)) == pytest.approx(
+        (0, 127, 0), abs=1
+    ), "white test pixel incorrect"
 
 
 def test_colorize_invalid_mode() -> None:
@@ -594,18 +532,12 @@ def test_autocontrast_mask_real_input() -> None:
         result_nomask = ImageOps.autocontrast(img)
 
         assert result_nomask != result
-        assert_tuple_approx_equal(
-            ImageStat.Stat(result, mask=rect_mask).median,
-            (195, 202, 184),
-            threshold=2,
-            msg="autocontrast with mask pixel incorrect",
-        )
-        assert_tuple_approx_equal(
-            ImageStat.Stat(result_nomask).median,
-            (119, 106, 79),
-            threshold=2,
-            msg="autocontrast without mask pixel incorrect",
-        )
+        assert ImageStat.Stat(result, mask=rect_mask).median == pytest.approx(
+            (195, 202, 184), abs=2
+        ), "autocontrast with mask pixel incorrect"
+        assert ImageStat.Stat(result_nomask).median == pytest.approx(
+            (119, 106, 79), abs=2
+        ), "autocontrast without mask pixel incorrect"
 
 
 def test_autocontrast_preserve_tone() -> None:

Tests/test_tiff_ifdrational.py

@@ -41,12 +41,12 @@ def test_sanity() -> None:
 
 def test_float() -> None:
     # float() must agree with ==, int() and repr(), which all use the
-    # normalized fraction
+    # normalized fraction
     r = IFDRational(1.5, 3)
     assert r == 0.5
     assert float(r) == 0.5
 
-    # Integer numerator and 0/0 (nan) cases
+    # Integer numerator and 0/0 (nan) cases
     assert float(IFDRational(4, 2)) == 2.0
     assert math.isnan(float(IFDRational(0, 0)))
 

pyproject.toml

@@ -187,6 +187,11 @@ lint.isort.required-imports = [
 max_supported_python = "3.15"
 
 [tool.mypy]
+exclude = [
+  "^Tests/images/msp/",
+  "^Tests/images/picins/",
+  "^Tests/images/sunraster/",
+]
 follow_imports = "silent"
 python_version = "3.11"
 disallow_any_generics = true
@@ -197,6 +202,7 @@ warn_unreachable = true
 enable_error_code = "ignore-without-code"
 extra_checks = true
 pretty = true
+num_workers = 4
 
 [tool.pytest]
 addopts = [ "-ra", "--color=auto" ]