Merge branch 'python-pillow:main' into main

.github/workflows/docs.yml

@@ -37,16 +37,26 @@ jobs:
       with:
         python-version: "3.x"
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: "3.x"
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Build
       run: |

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: pre-commit cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pre-commit
         key: lint-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}

.github/workflows/test-cygwin.yml

@@ -95,7 +95,7 @@ jobs:
           python3 -m pip list --outdated | grep numpy | sed -r 's/ +/ /g' | cut -d ' ' -f 3 | sed 's/^/version=/' >> $GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: 'C:\cygwin\home\runneradmin\.cache\pip'
           key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-${{ hashFiles('.ci/install.sh') }}

.github/workflows/test-windows.yml

@@ -89,7 +89,7 @@ jobs:
 
     - name: Cache build
       id: build-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: winbuild\build
         key:

.github/workflows/test.yml

@@ -26,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build:
 
@@ -65,17 +68,28 @@ jobs:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      if: startsWith(matrix.os, 'ubuntu')
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: ${{ matrix.python-version }}
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Install macOS dependencies
       if: startsWith(matrix.os, 'macOS')

CHANGES.rst

@@ -5,6 +5,12 @@ Changelog (Pillow)
 10.3.0 (unreleased)
 -------------------
 
+- Do not support using test-image-results to upload images after test failures #7739
+  [radarhere]
+
+- Changed ImageMath.ops to be static #7721
+  [radarhere]
+
 - Fix APNG info after seeking backwards more than twice #7701
   [esoma, radarhere]
 

Tests/bench_cffi_access.py

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

Tests/check_fli_overflow.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 from PIL import Image
 
 TEST_FILE = "Tests/images/fli_overflow.fli"
 
 
-def test_fli_overflow():
+def test_fli_overflow() -> None:
     # this should not crash with a malloc error or access violation
     with Image.open(TEST_FILE) as im:
         im.load()

Tests/check_imaging_leaks.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 from __future__ import annotations
+
+from typing import Any, Callable
+
 import pytest
 
 from PIL import Image
@@ -12,31 +15,34 @@ max_iterations = 10000
 pytestmark = pytest.mark.skipif(is_win32(), reason="requires Unix or macOS")
 
 
-def _get_mem_usage():
+def _get_mem_usage() -> float:
     from resource import RUSAGE_SELF, getpagesize, getrusage
 
     mem = getrusage(RUSAGE_SELF).ru_maxrss
     return mem * getpagesize() / 1024 / 1024
 
 
-def _test_leak(min_iterations, max_iterations, fn, *args, **kwargs):
+def _test_leak(
+    min_iterations: int, max_iterations: int, fn: Callable[..., None], *args: Any
+) -> None:
     mem_limit = None
     for i in range(max_iterations):
-        fn(*args, **kwargs)
+        fn(*args)
         mem = _get_mem_usage()
         if i < min_iterations:
             mem_limit = mem + 1
             continue
         msg = f"memory usage limit exceeded after {i + 1} iterations"
+        assert mem_limit is not None
         assert mem <= mem_limit, msg
 
 
-def test_leak_putdata():
+def test_leak_putdata() -> None:
     im = Image.new("RGB", (25, 25))
     _test_leak(min_iterations, max_iterations, im.putdata, im.getdata())
 
 
-def test_leak_getlist():
+def test_leak_getlist() -> None:
     im = Image.new("P", (25, 25))
     _test_leak(
         min_iterations,

Tests/check_j2k_leaks.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 import pytest
@@ -19,7 +20,7 @@ pytestmark = [
 ]
 
 
-def test_leak_load():
+def test_leak_load() -> None:
     from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))
@@ -29,7 +30,7 @@ def test_leak_load():
             im.load()
 
 
-def test_leak_save():
+def test_leak_save() -> None:
     from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))

Tests/check_j2k_overflow.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
 
 
-def test_j2k_overflow(tmp_path):
+def test_j2k_overflow(tmp_path: Path) -> None:
     im = Image.new("RGBA", (1024, 131584))
     target = str(tmp_path / "temp.jpc")
     with pytest.raises(OSError):

Tests/check_jp2_overflow.py

@@ -14,7 +14,6 @@
 # version.
 from __future__ import annotations
 
-
 from PIL import Image
 
 repro = ("00r0_gray_l.jp2", "00r1_graya_la.jp2")

Tests/check_jpeg_leaks.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 import pytest
@@ -110,14 +111,14 @@ standard_chrominance_qtable = (
         [standard_l_qtable, standard_chrominance_qtable],
     ),
 )
-def test_qtables_leak(qtables):
+def test_qtables_leak(qtables: tuple[tuple[int, ...]] | list[tuple[int, ...]]) -> None:
     im = hopper("RGB")
     for _ in range(iterations):
         test_output = BytesIO()
         im.save(test_output, "JPEG", qtables=qtables)
 
 
-def test_exif_leak():
+def test_exif_leak() -> None:
     """
     pre patch:
 
@@ -180,7 +181,7 @@ def test_exif_leak():
         im.save(test_output, "JPEG", exif=exif)
 
 
-def test_base_save():
+def test_base_save() -> None:
     """
     base case:
         MB

Tests/check_large_memory.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 import sys
+from pathlib import Path
+from types import ModuleType
 
 import pytest
 
@@ -15,6 +18,7 @@ from PIL import Image
 # 2.7 and 3.2.
 
 
+numpy: ModuleType | None
 try:
     import numpy
 except ImportError:
@@ -27,23 +31,24 @@ XDIM = 48000
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path, xdim, ydim):
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     f = str(tmp_path / "temp.png")
     im = Image.new("L", (xdim, ydim), 0)
     im.save(f)
 
 
-def test_large(tmp_path):
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path):
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)
 
 
 @pytest.mark.skipif(numpy is None, reason="Numpy is not installed")
-def test_size_greater_than_int():
+def test_size_greater_than_int() -> None:
+    assert numpy is not None
     arr = numpy.ndarray(shape=(16394, 16394))
     Image.fromarray(arr)

Tests/check_large_memory_numpy.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import sys
+from pathlib import Path
 
 import pytest
 
@@ -23,7 +25,7 @@ XDIM = 48000
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path, xdim, ydim):
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     dtype = np.uint8
     a = np.zeros((xdim, ydim), dtype=dtype)
     f = str(tmp_path / "temp.png")
@@ -31,11 +33,11 @@ def _write_png(tmp_path, xdim, ydim):
     im.save(f)
 
 
-def test_large(tmp_path):
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path):
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)

Tests/check_libtiff_segfault.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -6,7 +7,7 @@ from PIL import Image
 TEST_FILE = "Tests/images/libtiff_segfault.tif"
 
 
-def test_libtiff_segfault():
+def test_libtiff_segfault() -> None:
     """This test should not segfault. It will on Pillow <= 3.1.0 and
     libtiff >= 4.0.0
     """

Tests/check_png_dos.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import zlib
 from io import BytesIO
 
@@ -7,7 +8,7 @@ from PIL import Image, ImageFile, PngImagePlugin
 TEST_FILE = "Tests/images/png_decompression_dos.png"
 
 
-def test_ignore_dos_text():
+def test_ignore_dos_text() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = True
 
     try:
@@ -23,7 +24,7 @@ def test_ignore_dos_text():
         assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
 
 
-def test_dos_text():
+def test_dos_text() -> None:
     try:
         im = Image.open(TEST_FILE)
         im.load()
@@ -35,7 +36,7 @@ def test_dos_text():
         assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
 
 
-def test_dos_total_memory():
+def test_dos_total_memory() -> None:
     im = Image.new("L", (1, 1))
     compressed_data = zlib.compress(b"a" * 1024 * 1023)
 
@@ -52,7 +53,7 @@ def test_dos_total_memory():
     try:
         im2 = Image.open(b)
     except ValueError as msg:
-        assert "Too much memory" in msg
+        assert "Too much memory" in str(msg)
         return
 
     total_len = 0

Tests/check_release_notes.py

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

Tests/check_wheel.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import sys
 
 from PIL import features
 
 
-def test_wheel_modules():
+def test_wheel_modules() -> None:
     expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp"}
 
     # tkinter is not available in cibuildwheel installed CPython on Windows
@@ -18,13 +19,13 @@ def test_wheel_modules():
     assert set(features.get_supported_modules()) == expected_modules
 
 
-def test_wheel_codecs():
+def test_wheel_codecs() -> None:
     expected_codecs = {"jpg", "jpg_2000", "zlib", "libtiff"}
 
     assert set(features.get_supported_codecs()) == expected_codecs
 
 
-def test_wheel_features():
+def test_wheel_features() -> None:
     expected_features = {
         "webp_anim",
         "webp_mux",

Tests/conftest.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
+
 import io
 
+import pytest
 
-def pytest_report_header(config):
+
+def pytest_report_header(config: pytest.Config) -> str:
     try:
         from PIL import features
 
@@ -13,7 +16,7 @@ def pytest_report_header(config):
         return f"pytest_report_header failed: {e}"
 
 
-def pytest_configure(config):
+def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line(
         "markers",
         "pil_noop_mark: A conditional mark where nothing special happens",

Tests/createfontdatachunk.py

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

Tests/helper.py

@@ -11,6 +11,7 @@ import sys
 import sysconfig
 import tempfile
 from io import BytesIO
+from typing import Any, Callable, Sequence
 
 import pytest
 from packaging.version import parse as parse_version
@@ -19,42 +20,31 @@ from PIL import Image, ImageMath, features
 
 logger = logging.getLogger(__name__)
 
-
-HAS_UPLOADER = False
-
+uploader = None
 if os.environ.get("SHOW_ERRORS"):
-    # local img.show for errors.
-    HAS_UPLOADER = True
-
-    class test_image_results:
-        @staticmethod
-        def upload(a, b):
-            a.show()
-            b.show()
-
+    uploader = "show"
 elif "GITHUB_ACTIONS" in os.environ:
-    HAS_UPLOADER = True
-
-    class test_image_results:
-        @staticmethod
-        def upload(a, b):
-            dir_errors = os.path.join(os.path.dirname(__file__), "errors")
-            os.makedirs(dir_errors, exist_ok=True)
-            tmpdir = tempfile.mkdtemp(dir=dir_errors)
-            a.save(os.path.join(tmpdir, "a.png"))
-            b.save(os.path.join(tmpdir, "b.png"))
-            return tmpdir
-
-else:
-    try:
-        import test_image_results
-
-        HAS_UPLOADER = True
-    except ImportError:
-        pass
+    uploader = "github_actions"
 
 
-def convert_to_comparable(a, b):
+def upload(a: Image.Image, b: Image.Image) -> str | None:
+    if uploader == "show":
+        # local img.show for errors.
+        a.show()
+        b.show()
+    elif uploader == "github_actions":
+        dir_errors = os.path.join(os.path.dirname(__file__), "errors")
+        os.makedirs(dir_errors, exist_ok=True)
+        tmpdir = tempfile.mkdtemp(dir=dir_errors)
+        a.save(os.path.join(tmpdir, "a.png"))
+        b.save(os.path.join(tmpdir, "b.png"))
+        return tmpdir
+    return None
+
+
+def convert_to_comparable(
+    a: Image.Image, b: Image.Image
+) -> tuple[Image.Image, Image.Image]:
     new_a, new_b = a, b
     if a.mode == "P":
         new_a = Image.new("L", a.size)
@@ -67,14 +57,18 @@ def convert_to_comparable(a, b):
     return new_a, new_b
 
 
-def assert_deep_equal(a, b, msg=None):
+def assert_deep_equal(
+    a: Sequence[Any], b: Sequence[Any], msg: str | None = None
+) -> None:
     try:
         assert len(a) == len(b), msg or f"got length {len(a)}, expected {len(b)}"
     except Exception:
         assert a == b, msg
 
 
-def assert_image(im, mode, size, msg=None):
+def assert_image(
+    im: Image.Image, mode: str, size: tuple[int, int], msg: str | None = None
+) -> None:
     if mode is not None:
         assert im.mode == mode, (
             msg or f"got mode {repr(im.mode)}, expected {repr(mode)}"
@@ -86,28 +80,32 @@ def assert_image(im, mode, size, msg=None):
         )
 
 
-def assert_image_equal(a, b, msg=None):
+def assert_image_equal(a: Image.Image, b: Image.Image, msg: str | None = None) -> None:
     assert a.mode == b.mode, msg or f"got mode {repr(a.mode)}, expected {repr(b.mode)}"
     assert a.size == b.size, msg or f"got size {repr(a.size)}, expected {repr(b.size)}"
     if a.tobytes() != b.tobytes():
-        if HAS_UPLOADER:
-            try:
-                url = test_image_results.upload(a, b)
+        try:
+            url = upload(a, b)
+            if url:
                 logger.error("URL for test images: %s", url)
-            except Exception:
-                pass
+        except Exception:
+            pass
 
         pytest.fail(msg or "got different content")
 
 
-def assert_image_equal_tofile(a, filename, msg=None, mode=None):
+def assert_image_equal_tofile(
+    a: Image.Image, filename: str, msg: str | None = None, mode: str | None = None
+) -> None:
     with Image.open(filename) as img:
         if mode:
             img = img.convert(mode)
         assert_image_equal(a, img, msg)
 
 
-def assert_image_similar(a, b, epsilon, msg=None):
+def assert_image_similar(
+    a: Image.Image, b: Image.Image, epsilon: float, msg: str | None = None
+) -> None:
     assert a.mode == b.mode, msg or f"got mode {repr(a.mode)}, expected {repr(b.mode)}"
     assert a.size == b.size, msg or f"got size {repr(a.size)}, expected {repr(b.size)}"
 
@@ -125,55 +123,68 @@ def assert_image_similar(a, b, epsilon, msg=None):
             + f" average pixel value difference {ave_diff:.4f} > epsilon {epsilon:.4f}"
         )
     except Exception as e:
-        if HAS_UPLOADER:
-            try:
-                url = test_image_results.upload(a, b)
+        try:
+            url = upload(a, b)
+            if url:
                 logger.exception("URL for test images: %s", url)
-            except Exception:
-                pass
+        except Exception:
+            pass
         raise e
 
 
-def assert_image_similar_tofile(a, filename, epsilon, msg=None, mode=None):
+def assert_image_similar_tofile(
+    a: Image.Image,
+    filename: str,
+    epsilon: float,
+    msg: str | None = None,
+    mode: str | None = None,
+) -> None:
     with Image.open(filename) as img:
         if mode:
             img = img.convert(mode)
         assert_image_similar(a, img, epsilon, msg)
 
 
-def assert_all_same(items, msg=None):
+def assert_all_same(items: Sequence[Any], msg: str | None = None) -> None:
     assert items.count(items[0]) == len(items), msg
 
 
-def assert_not_all_same(items, msg=None):
+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, targets, threshold, 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"""
-    value = True
     for i, target in enumerate(targets):
-        value *= target - threshold <= actuals[i] <= target + threshold
-
-    assert value, msg + ": " + repr(actuals) + " != " + repr(targets)
+        if not (target - threshold <= actuals[i] <= target + threshold):
+            pytest.fail(msg + ": " + repr(actuals) + " != " + repr(targets))
 
 
-def skip_unless_feature(feature):
+def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
     reason = f"{feature} not available"
     return pytest.mark.skipif(not features.check(feature), reason=reason)
 
 
-def skip_unless_feature_version(feature, version_required, reason=None):
+def skip_unless_feature_version(
+    feature: str, required: str, reason: str | None = None
+) -> pytest.MarkDecorator:
     if not features.check(feature):
         return pytest.mark.skip(f"{feature} not available")
     if reason is None:
-        reason = f"{feature} is older than {version_required}"
-    version_required = parse_version(version_required)
+        reason = f"{feature} is older than {required}"
+    version_required = parse_version(required)
     version_available = parse_version(features.version(feature))
     return pytest.mark.skipif(version_available < version_required, reason=reason)
 
 
-def mark_if_feature_version(mark, feature, version_blacklist, reason=None):
+def mark_if_feature_version(
+    mark: pytest.MarkDecorator,
+    feature: str,
+    version_blacklist: str,
+    reason: str | None = None,
+) -> pytest.MarkDecorator:
     if not features.check(feature):
         return pytest.mark.pil_noop_mark()
     if reason is None:
@@ -194,7 +205,7 @@ class PillowLeakTestCase:
     iterations = 100  # count
     mem_limit = 512  # k
 
-    def _get_mem_usage(self):
+    def _get_mem_usage(self) -> float:
         """
         Gets the RUSAGE memory usage, returns in K. Encapsulates the difference
         between macOS and Linux rss reporting
@@ -216,7 +227,7 @@ class PillowLeakTestCase:
         #  This is the maximum resident set size used (in kilobytes).
         return mem  # Kb
 
-    def _test_leak(self, core):
+    def _test_leak(self, core: Callable[[], None]) -> None:
         start_mem = self._get_mem_usage()
         for cycle in range(self.iterations):
             core()
@@ -228,17 +239,17 @@ class PillowLeakTestCase:
 # helpers
 
 
-def fromstring(data):
+def fromstring(data: bytes) -> Image.Image:
     return Image.open(BytesIO(data))
 
 
-def tostring(im, string_format, **options):
+def tostring(im: Image.Image, string_format: str, **options: dict[str, Any]) -> bytes:
     out = BytesIO()
     im.save(out, string_format, **options)
     return out.getvalue()
 
 
-def hopper(mode=None, cache={}):
+def hopper(mode: str | None = None, cache: dict[str, Image.Image] = {}) -> Image.Image:
     if mode is None:
         # Always return fresh not-yet-loaded version of image.
         # Operations on not-yet-loaded images is separate class of errors
@@ -259,29 +270,31 @@ def hopper(mode=None, cache={}):
     return im.copy()
 
 
-def djpeg_available():
+def djpeg_available() -> bool:
     if shutil.which("djpeg"):
         try:
             subprocess.check_call(["djpeg", "-version"])
             return True
         except subprocess.CalledProcessError:  # pragma: no cover
             return False
+    return False
 
 
-def cjpeg_available():
+def cjpeg_available() -> bool:
     if shutil.which("cjpeg"):
         try:
             subprocess.check_call(["cjpeg", "-version"])
             return True
         except subprocess.CalledProcessError:  # pragma: no cover
             return False
+    return False
 
 
-def netpbm_available():
+def netpbm_available() -> bool:
     return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
 
 
-def magick_command():
+def magick_command() -> list[str] | None:
     if sys.platform == "win32":
         magickhome = os.environ.get("MAGICK_HOME")
         if magickhome:
@@ -298,47 +311,48 @@ def magick_command():
         return imagemagick
     if graphicsmagick and shutil.which(graphicsmagick[0]):
         return graphicsmagick
+    return None
 
 
-def on_appveyor():
+def on_appveyor() -> bool:
     return "APPVEYOR" in os.environ
 
 
-def on_github_actions():
+def on_github_actions() -> bool:
     return "GITHUB_ACTIONS" in os.environ
 
 
-def on_ci():
+def on_ci() -> bool:
     # GitHub Actions and AppVeyor have "CI"
     return "CI" in os.environ
 
 
-def is_big_endian():
+def is_big_endian() -> bool:
     return sys.byteorder == "big"
 
 
-def is_ppc64le():
+def is_ppc64le() -> bool:
     import platform
 
     return platform.machine() == "ppc64le"
 
 
-def is_win32():
+def is_win32() -> bool:
     return sys.platform.startswith("win32")
 
 
-def is_pypy():
+def is_pypy() -> bool:
     return hasattr(sys, "pypy_translation_info")
 
 
-def is_mingw():
+def is_mingw() -> bool:
     return sysconfig.get_platform() == "mingw"
 
 
 class CachedProperty:
-    def __init__(self, func):
+    def __init__(self, func: Callable[[Any], None]) -> None:
         self.func = func
 
-    def __get__(self, instance, cls=None):
+    def __get__(self, instance: Any, cls: type[Any] | None = None) -> Any:
         result = instance.__dict__[self.func.__name__] = self.func(instance)
         return result

Tests/oss-fuzz/fuzz_font.py

@@ -23,7 +23,7 @@ with atheris.instrument_imports():
     import fuzzers
 
 
-def TestOneInput(data):
+def TestOneInput(data: bytes) -> None:
     try:
         fuzzers.fuzz_font(data)
     except Exception:
@@ -32,7 +32,7 @@ def TestOneInput(data):
         pass
 
 
-def main():
+def main() -> None:
     fuzzers.enable_decompressionbomb_error()
     atheris.Setup(sys.argv, TestOneInput)
     atheris.Fuzz()

Tests/oss-fuzz/fuzz_pillow.py

@@ -23,7 +23,7 @@ with atheris.instrument_imports():
     import fuzzers
 
 
-def TestOneInput(data):
+def TestOneInput(data: bytes) -> None:
     try:
         fuzzers.fuzz_image(data)
     except Exception:
@@ -32,7 +32,7 @@ def TestOneInput(data):
         pass
 
 
-def main():
+def main() -> None:
     fuzzers.enable_decompressionbomb_error()
     atheris.Setup(sys.argv, TestOneInput)
     atheris.Fuzz()

Tests/oss-fuzz/fuzzers.py

@@ -1,22 +1,23 @@
 from __future__ import annotations
+
 import io
 import warnings
 
 from PIL import Image, ImageDraw, ImageFile, ImageFilter, ImageFont
 
 
-def enable_decompressionbomb_error():
+def enable_decompressionbomb_error() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = True
     warnings.filterwarnings("ignore")
     warnings.simplefilter("error", Image.DecompressionBombWarning)
 
 
-def disable_decompressionbomb_error():
+def disable_decompressionbomb_error() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = False
     warnings.resetwarnings()
 
 
-def fuzz_image(data):
+def fuzz_image(data: bytes) -> None:
     # This will fail on some images in the corpus, as we have many
     # invalid images in the test suite.
     with Image.open(io.BytesIO(data)) as im:
@@ -25,7 +26,7 @@ def fuzz_image(data):
         im.save(io.BytesIO(), "BMP")
 
 
-def fuzz_font(data):
+def fuzz_font(data: bytes) -> None:
     wrapper = io.BytesIO(data)
     try:
         font = ImageFont.truetype(wrapper)

Tests/oss-fuzz/test_fuzzers.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import subprocess
 import sys
 
@@ -23,7 +24,7 @@ if features.check("libjpeg_turbo"):
     "path",
     subprocess.check_output("find Tests/images -type f", shell=True).split(b"\n"),
 )
-def test_fuzz_images(path):
+def test_fuzz_images(path: str) -> None:
     fuzzers.enable_decompressionbomb_error()
     try:
         with open(path, "rb") as f:
@@ -54,7 +55,7 @@ def test_fuzz_images(path):
 @pytest.mark.parametrize(
     "path", subprocess.check_output("find Tests/fonts -type f", shell=True).split(b"\n")
 )
-def test_fuzz_fonts(path):
+def test_fuzz_fonts(path: str) -> None:
     if not path:
         return
     with open(path, "rb") as f:

Tests/test_000_sanity.py

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

Tests/test_binary.py

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

Tests/test_bmp_reference.py

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

Tests/test_box_blur.py

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

Tests/test_color_lut.py

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

Tests/test_core_resources.py

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

Tests/test_decompression_bomb.py

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

Tests/test_deprecate.py

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

Tests/test_features.py

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

Tests/test_file_apng.py

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

Tests/test_file_blp.py

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

Tests/test_file_bmp.py

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

Tests/test_file_bufrstub.py

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

Tests/test_file_container.py

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

Tests/test_file_cur.py

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

Tests/test_file_dcx.py

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

Tests/test_file_dds.py

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

Tests/test_file_eps.py

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

Tests/test_file_fits.py

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

Tests/test_file_fli.py

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

Tests/test_file_fpx.py

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

Tests/test_file_ftex.py

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

Tests/test_file_gbr.py

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

Tests/test_file_gd.py

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

Tests/test_file_gif.py

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

Tests/test_file_gimpgradient.py

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

Tests/test_file_gimppalette.py

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

Tests/test_file_gribstub.py

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

Tests/test_file_hdf5stub.py

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

Tests/test_file_icns.py

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

Tests/test_file_ico.py

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

Tests/test_file_im.py

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

Tests/test_file_imt.py

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

Tests/test_file_iptc.py

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

Tests/test_file_jpeg.py

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

Tests/test_file_jpeg2k.py

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

Tests/test_file_libtiff.py

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

Tests/test_file_libtiff_small.py

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

Tests/test_file_mcidas.py

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

Tests/test_file_mic.py

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

Tests/test_file_mpo.py

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

Tests/test_file_msp.py

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

Tests/test_file_palm.py

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

Tests/test_file_pcd.py

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

Tests/test_file_pcx.py

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

Tests/test_file_pdf.py

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

Tests/test_file_pixar.py

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

Tests/test_file_png.py

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

Tests/test_file_ppm.py

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

Tests/test_file_psd.py

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

Tests/test_file_qoi.py

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

Tests/test_file_sgi.py

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

Tests/test_file_spider.py

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

Tests/test_file_sun.py

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

Tests/test_file_tar.py

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

Tests/test_file_tga.py

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

Tests/test_file_tiff.py

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

Tests/test_file_tiff_metadata.py

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

Tests/test_file_wal.py

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

Tests/test_file_webp.py

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

Tests/test_file_webp_alpha.py

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

Tests/test_file_webp_animated.py

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

Tests/test_file_webp_lossless.py

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

Tests/test_file_webp_metadata.py

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

Tests/test_file_wmf.py

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

Tests/test_file_xbm.py

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

Tests/test_file_xpm.py

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

Tests/test_file_xvthumb.py

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

Tests/test_font_bdf.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import BdfFontFile, FontFile
@@ -6,7 +7,7 @@ from PIL import BdfFontFile, FontFile
 filename = "Tests/images/courB08.bdf"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with open(filename, "rb") as test_file:
         font = BdfFontFile.BdfFontFile(test_file)
 
@@ -14,7 +15,7 @@ def test_sanity():
     assert len([_f for _f in font.glyph if _f]) == 190
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             BdfFontFile.BdfFontFile(fp)

Tests/test_font_crash.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageDraw, ImageFont
@@ -7,7 +8,7 @@ from .helper import skip_unless_feature
 
 
 class TestFontCrash:
-    def _fuzz_font(self, font):
+    def _fuzz_font(self, font: ImageFont.FreeTypeFont) -> None:
         # from fuzzers.fuzz_font
         font.getbbox("ABC")
         font.getmask("test text")
@@ -17,7 +18,7 @@ class TestFontCrash:
             draw.text((10, 10), "Test Text", font=font, fill="#000")
 
     @skip_unless_feature("freetype2")
-    def test_segfault(self):
+    def test_segfault(self) -> None:
         with pytest.raises(OSError):
             font = ImageFont.truetype("Tests/fonts/fuzz_font-5203009437302784")
             self._fuzz_font(font)

Tests/test_font_leaks.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from PIL import Image, ImageDraw, ImageFont
 
 from .helper import PillowLeakTestCase, skip_unless_feature
@@ -9,7 +10,7 @@ class TestTTypeFontLeak(PillowLeakTestCase):
     iterations = 10
     mem_limit = 4096  # k
 
-    def _test_font(self, font):
+    def _test_font(self, font: ImageFont.FreeTypeFont) -> None:
         im = Image.new("RGB", (255, 255), "white")
         draw = ImageDraw.ImageDraw(im)
         self._test_leak(
@@ -19,7 +20,7 @@ class TestTTypeFontLeak(PillowLeakTestCase):
         )
 
     @skip_unless_feature("freetype2")
-    def test_leak(self):
+    def test_leak(self) -> None:
         ttype = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 20)
         self._test_font(ttype)
 
@@ -29,6 +30,6 @@ class TestDefaultFontLeak(TestTTypeFontLeak):
     iterations = 100
     mem_limit = 1024  # k
 
-    def test_leak(self):
+    def test_leak(self) -> None:
         default_font = ImageFont.load_default()
         self._test_font(default_font)

Tests/test_font_pcf.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import os
+from pathlib import Path
 
 import pytest
 
@@ -19,7 +21,7 @@ message = "hello, world"
 pytestmark = skip_unless_feature("zlib")
 
 
-def save_font(request, tmp_path):
+def save_font(request: pytest.FixtureRequest, tmp_path: Path) -> str:
     with open(fontname, "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file)
     assert isinstance(font, FontFile.FontFile)
@@ -28,7 +30,7 @@ def save_font(request, tmp_path):
 
     tempname = str(tmp_path / "temp.pil")
 
-    def delete_tempfile():
+    def delete_tempfile() -> None:
         try:
             os.remove(tempname[:-4] + ".pbm")
         except OSError:
@@ -46,11 +48,11 @@ def save_font(request, tmp_path):
     return tempname
 
 
-def test_sanity(request, tmp_path):
+def test_sanity(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     save_font(request, tmp_path)
 
 
-def test_less_than_256_characters():
+def test_less_than_256_characters() -> None:
     with open("Tests/fonts/10x20-ISO8859-1-fewer-characters.pcf", "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file)
     assert isinstance(font, FontFile.FontFile)
@@ -58,13 +60,13 @@ def test_less_than_256_characters():
     assert len([_f for _f in font.glyph if _f]) == 127
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             PcfFontFile.PcfFontFile(fp)
 
 
-def test_draw(request, tmp_path):
+def test_draw(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     im = Image.new("L", (130, 30), "white")
@@ -73,7 +75,7 @@ def test_draw(request, tmp_path):
     assert_image_similar_tofile(im, "Tests/images/test_draw_pbm_target.png", 0)
 
 
-def test_textsize(request, tmp_path):
+def test_textsize(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     for i in range(255):
@@ -89,7 +91,9 @@ def test_textsize(request, tmp_path):
         assert font.getbbox(msg) == (0, 0, len(msg) * 10, 20)
 
 
-def _test_high_characters(request, tmp_path, message):
+def _test_high_characters(
+    request: pytest.FixtureRequest, tmp_path: Path, message: str | bytes
+) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     im = Image.new("L", (750, 30), "white")
@@ -98,7 +102,7 @@ def _test_high_characters(request, tmp_path, message):
     assert_image_similar_tofile(im, "Tests/images/high_ascii_chars.png", 0)
 
 
-def test_high_characters(request, tmp_path):
+def test_high_characters(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     message = "".join(chr(i + 1) for i in range(140, 232))
     _test_high_characters(request, tmp_path, message)
     # accept bytes instances.

Tests/test_font_pcf_charsets.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 import os
+from pathlib import Path
+from typing import TypedDict
 
 import pytest
 
@@ -13,7 +16,14 @@ from .helper import (
 
 fontname = "Tests/fonts/ter-x20b.pcf"
 
-charsets = {
+
+class Charset(TypedDict):
+    glyph_count: int
+    message: str
+    image1: str
+
+
+charsets: dict[str, Charset] = {
     "iso8859-1": {
         "glyph_count": 223,
         "message": "hello, world",
@@ -35,7 +45,7 @@ charsets = {
 pytestmark = skip_unless_feature("zlib")
 
 
-def save_font(request, tmp_path, encoding):
+def save_font(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> str:
     with open(fontname, "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file, encoding)
     assert isinstance(font, FontFile.FontFile)
@@ -44,7 +54,7 @@ def save_font(request, tmp_path, encoding):
 
     tempname = str(tmp_path / "temp.pil")
 
-    def delete_tempfile():
+    def delete_tempfile() -> None:
         try:
             os.remove(tempname[:-4] + ".pbm")
         except OSError:
@@ -63,12 +73,12 @@ def save_font(request, tmp_path, encoding):
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_sanity(request, tmp_path, encoding):
+def test_sanity(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> None:
     save_font(request, tmp_path, encoding)
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_draw(request, tmp_path, encoding):
+def test_draw(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> None:
     tempname = save_font(request, tmp_path, encoding)
     font = ImageFont.load(tempname)
     im = Image.new("L", (150, 30), "white")
@@ -79,7 +89,9 @@ def test_draw(request, tmp_path, encoding):
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_textsize(request, tmp_path, encoding):
+def test_textsize(
+    request: pytest.FixtureRequest, tmp_path: Path, encoding: str
+) -> None:
     tempname = save_font(request, tmp_path, encoding)
     font = ImageFont.load(tempname)
     for i in range(255):

Tests/test_fontfile.py

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