Merge pull request #26511 from meeseeksmachine/auto-backport-of-pr-26490-on-v3.8.x

ksunden · web-flow · commit 104b93d5896b · 2023-08-14T14:50:50.000-05:00
Backport PR #26490 on branch v3.8.x (Import PIL.Image explicitly over PIL)
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
@@ -30,7 +30,7 @@ import matplotlib.stackplot as mstack
 import matplotlib.streamplot as mstream
 
 import datetime
-import PIL
+import PIL.Image
 from collections.abc import Callable, Sequence
 from typing import Any, Literal, overload
 import numpy as np
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -15,7 +15,7 @@
 import weakref
 
 import numpy as np
-import PIL
+import PIL.Image
 
 import matplotlib as mpl
 from matplotlib.backend_bases import (
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -10,6 +10,7 @@
 import warnings
 
 import numpy as np
+import PIL.Image
 import PIL.PngImagePlugin
 
 import matplotlib as mpl
diff --git a/lib/matplotlib/image.pyi b/lib/matplotlib/image.pyi
@@ -5,7 +5,7 @@ from typing import Any, BinaryIO, Literal
 
 import numpy as np
 from numpy.typing import ArrayLike, NDArray
-import PIL  # type: ignore
+import PIL.Image
 
 import matplotlib.artist as martist
 from matplotlib.axes import Axes
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -88,7 +88,7 @@
     from typing import Any, BinaryIO, Literal, TypeVar
     from typing_extensions import ParamSpec
 
-    import PIL
+    import PIL.Image
     from numpy.typing import ArrayLike
 
     from matplotlib.axis import Tick
diff --git a/lib/matplotlib/widgets.pyi b/lib/matplotlib/widgets.pyi
@@ -7,7 +7,7 @@ from .lines import Line2D
 from .patches import Circle, Polygon, Rectangle
 from .text import Text
 
-import PIL
+import PIL.Image
 
 from collections.abc import Callable, Collection, Iterable, Sequence
 from typing import Any, Literal
