Merge pull request #7644 from radarhere/import

Author: hugovk

Tests/oss-fuzz/test_fuzzers.py

@@ -7,7 +7,7 @@
 import packaging
 import pytest
 
-from PIL import Image, features
+from PIL import Image, UnidentifiedImageError, features
 from Tests.helper import skip_unless_feature
 
 if sys.platform.startswith("win32"):
@@ -43,7 +43,7 @@ def test_fuzz_images(path: str) -> None:
     except (
         Image.DecompressionBombError,
         Image.DecompressionBombWarning,
-        Image.UnidentifiedImageError,
+        UnidentifiedImageError,
     ):
         # Known Image.* exceptions
         assert True

Tests/test_file_eps.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from PIL import EpsImagePlugin, Image, features
+from PIL import EpsImagePlugin, Image, UnidentifiedImageError, features
 
 from .helper import (
     assert_image_similar,
@@ -419,7 +419,7 @@ def test_emptyline() -> None:
 )
 def test_timeout(test_file: str) -> None:
     with open(test_file, "rb") as f:
-        with pytest.raises(Image.UnidentifiedImageError):
+        with pytest.raises(UnidentifiedImageError):
             with Image.open(f):
                 pass
 

Tests/test_file_psd.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from PIL import Image, PsdImagePlugin
+from PIL import Image, PsdImagePlugin, UnidentifiedImageError
 
 from .helper import assert_image_equal_tofile, assert_image_similar, hopper, is_pypy
 
@@ -152,11 +152,11 @@ def test_combined_larger_than_size() -> None:
     [
         (
             "Tests/images/timeout-1ee28a249896e05b83840ae8140622de8e648ba9.psd",
-            Image.UnidentifiedImageError,
+            UnidentifiedImageError,
         ),
         (
             "Tests/images/timeout-598843abc37fc080ec36a2699ebbd44f795d3a6f.psd",
-            Image.UnidentifiedImageError,
+            UnidentifiedImageError,
         ),
         ("Tests/images/timeout-c8efc3fded6426986ba867a399791bae544f59bc.psd", OSError),
         ("Tests/images/timeout-dedc7a4ebd856d79b4359bbcc79e8ef231ce38f6.psd", OSError),

src/PIL/ImageCms.py

@@ -25,7 +25,7 @@
 from functools import reduce
 from typing import Any
 
-from . import Image
+from . import Image, __version__
 from ._deprecate import deprecate
 
 try:
@@ -1087,4 +1087,4 @@ def versions():
         12,
         '(PIL.features.version("littlecms2"), sys.version, PIL.__version__)',
     )
-    return _VERSION, core.littlecms_version, sys.version.split()[0], Image.__version__
+    return _VERSION, core.littlecms_version, sys.version.split()[0], __version__