python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 09:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use functools.lru_cache for hopper()

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-03-20 09:49:18 +02:00
parent e3aeaa6ff8
commit 504a2e17c8
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tests/helper.py
View File

@ -11,6 +11,7 @@ import subprocess
import sys import sys
import sysconfig import sysconfig
import tempfile import tempfile
from functools import lru_cache
from io import BytesIO from io import BytesIO
from typing import Any, Callable, Sequence from typing import Any, Callable, Sequence
@ -250,25 +251,27 @@ def tostring(im: Image.Image, string_format: str, **options: Any) -> bytes:
return out.getvalue() return out.getvalue()
def hopper(mode: str | None = None, cache: dict[str, Image.Image] = {}) -> Image.Image: def hopper(mode: str | None = None) -> Image.Image:
# Use caching to reduce reading from disk but so an original copy is
# returned each time and the cached image isn't modified by tests
# (for fast, isolated, repeatable tests).
return _cached_hopper(mode).copy()
@lru_cache(maxsize=None)
def _cached_hopper(mode: str | None = None) -> Image.Image:
if mode is None: if mode is None:
# Always return fresh not-yet-loaded version of image. # Always return fresh not-yet-loaded version of image.
# Operations on not-yet-loaded images is separate class of errors # Operations on not-yet-loaded images is separate class of errors
# what we should catch. # what we should catch.
return Image.open("Tests/images/hopper.ppm") return Image.open("Tests/images/hopper.ppm")
# Use caching to reduce reading from disk but so an original copy is
# returned each time and the cached image isn't modified by tests
# (for fast, isolated, repeatable tests).
im = cache.get(mode)
if im is None:
if mode == "F": if mode == "F":
im = hopper("L").convert(mode) im = _cached_hopper("L").convert(mode)
elif mode[:4] == "I;16": elif mode[:4] == "I;16":
im = hopper("I").convert(mode) im = _cached_hopper("I").convert(mode)
else: else:
im = hopper().convert(mode) im = _cached_hopper().convert(mode)
cache[mode] = im return im
return im.copy()
def djpeg_available() -> bool: def djpeg_available() -> bool: