Generalize Affine2DBase to AffineImmutable

trananso · trananso · commit f683fc785151 · 2024-05-10T09:43:27.000-04:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -439,10 +439,10 @@ def draw_image(self, gc, x, y, im, transform=None):
         im : (N, M, 4) array of `numpy.uint8`
             An array of RGBA pixels.
 
-        transform : `~matplotlib.transforms.Affine2DBase`
+        transform : `~matplotlib.transforms.AffineImmutable`
             If and only if the concrete backend is written such that
             `option_scale_image` returns ``True``, an affine transformation
-            (i.e., an `.Affine2DBase`) *may* be passed to `draw_image`.  The
+            (i.e., an `.AffineImmutable`) *may* be passed to `draw_image`.  The
             translation vector of the transformation is given in physical units
             (i.e., dots or pixels). Note that the transformation does not
             override *x* and *y*, and has to be applied *before* translating
diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi
@@ -91,7 +91,7 @@ class RendererBase:
         x: float,
         y: float,
         im: ArrayLike,
-        transform: transforms.Affine2DBase | None = ...,
+        transform: transforms.AffineImmutable | None = ...,
     ) -> None: ...
     def option_image_nocomposite(self) -> bool: ...
     def option_scale_image(self) -> bool: ...
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -22,7 +22,7 @@
 from matplotlib.dates import UTC
 from matplotlib.path import Path
 from matplotlib import _path
-from matplotlib.transforms import Affine2D, Affine2DBase
+from matplotlib.transforms import Affine2D, AffineImmutable
 
 
 _log = logging.getLogger(__name__)
@@ -255,7 +255,7 @@ def _generate_transform(transform_list):
                 or type == 'translate' and value == (0, 0)
                 or type == 'rotate' and value == (0,)):
             continue
-        if type == 'matrix' and isinstance(value, Affine2DBase):
+        if type == 'matrix' and isinstance(value, AffineImmutable):
             value = value.to_values()
         parts.append('{}({})'.format(
             type, ' '.join(_short_float_fmt(x) for x in value)))
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -1062,10 +1062,10 @@ def get_path_collection_extents(
     master_transform : `~matplotlib.transforms.Transform`
         Global transformation applied to all paths.
     paths : list of `Path`
-    transforms : list of `~matplotlib.transforms.Affine2DBase`
+    transforms : list of `~matplotlib.transforms.AffineImmutable`
         If non-empty, this overrides *master_transform*.
     offsets : (N, 2) array-like
-    offset_transform : `~matplotlib.transforms.Affine2DBase`
+    offset_transform : `~matplotlib.transforms.AffineImmutable`
         Transform applied to the offsets before offsetting the path.
 
     Notes
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -155,7 +155,7 @@ def inverted(self):
         )
 
 
-class PolarAffine(mtransforms.Affine2DBase):
+class PolarAffine(mtransforms.AffineImmutable):
     r"""
     The affine part of the polar projection.
 
@@ -181,7 +181,7 @@ def __init__(self, scale_transform, limits):
             View limits of the data. The only part of its bounds that is used
             is the y limits (for the radius limits).
         """
-        super().__init__()
+        super().__init__(dims=2)
         self._scale_transform = scale_transform
         self._limits = limits
         self.set_children(scale_transform, limits)
diff --git a/lib/matplotlib/projections/polar.pyi b/lib/matplotlib/projections/polar.pyi
@@ -23,7 +23,7 @@ class PolarTransform(mtransforms.Transform):
     ) -> None: ...
     def inverted(self) -> InvertedPolarTransform: ...
 
-class PolarAffine(mtransforms.Affine2DBase):
+class PolarAffine(mtransforms.AffineImmutable):
     def __init__(
         self, scale_transform: mtransforms.Transform, limits: mtransforms.BboxBase
     ) -> None: ...
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
diff --git a/lib/matplotlib/transforms.pyi b/lib/matplotlib/transforms.pyi
