Merge branch 'main' into lcms

python-pillow · Apr 1, 2024 · aeb51cb · aeb51cb
2 parents facf3af + 5beb0b6
commit aeb51cb
Show file tree

Hide file tree

Showing 15 changed files with 962 additions and 291 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,12 @@ Changelog (Pillow)
 10.3.0 (unreleased)
 -------------------
 
+- Deprecate eval(), replacing it with lambda_eval() and unsafe_eval() #7927
+  [radarhere, hugovk]
+
+- Raise ValueError if seeking to greater than offset-sized integer in TIFF #7883
+  [radarhere]
+
 - Add --report argument to __main__.py to omit supported formats #7818
   [nulano, radarhere, hugovk]
 

diff --git a/Tests/helper.py b/Tests/helper.py
@@ -115,7 +115,9 @@ def assert_image_similar(
 
     diff = 0
     for ach, bch in zip(a.split(), b.split()):
-        chdiff = ImageMath.eval("abs(a - b)", a=ach, b=bch).convert("L")
+        chdiff = ImageMath.lambda_eval(
+            lambda args: abs(args["a"] - args["b"]), a=ach, b=bch
+        ).convert("L")
         diff += sum(i * num for i, num in enumerate(chdiff.histogram()))
 
     ave_diff = diff / (a.size[0] * a.size[1])

diff --git a/Tests/test_image_reduce.py b/Tests/test_image_reduce.py
@@ -186,7 +186,9 @@ def assert_compare_images(
 
     bands = ImageMode.getmode(a.mode).bands
     for band, ach, bch in zip(bands, a.split(), b.split()):
-        ch_diff = ImageMath.eval("convert(abs(a - b), 'L')", a=ach, b=bch)
+        ch_diff = ImageMath.lambda_eval(
+            lambda args: args["convert"](abs(args["a"] - args["b"]), "L"), a=ach, b=bch
+        )
         ch_hist = ch_diff.histogram()
 
         average_diff = sum(i * num for i, num in enumerate(ch_hist)) / (

diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py