Use super() more in transforms.

QuLogic · QuLogic · commit 3d208597d282 · 2020-07-23T01:41:12.000-04:00
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
@@ -237,7 +237,7 @@ def __init__(self, resolution):
         Resolution is the number of steps to interpolate between each input
         line segment to approximate its path in curved space.
         """
-        Transform.__init__(self)
+        super().__init__()
         self._resolution = resolution
 
     def __str__(self):
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -25,7 +25,7 @@ class PolarTransform(mtransforms.Transform):
 
     def __init__(self, axis=None, use_rmin=True,
                  _apply_theta_transforms=True):
-        mtransforms.Transform.__init__(self)
+        super().__init__()
         self._axis = axis
         self._use_rmin = use_rmin
         self._apply_theta_transforms = _apply_theta_transforms
@@ -119,7 +119,7 @@ def __init__(self, scale_transform, limits):
         its bounds that is used is the y limits (for the radius limits).
         The theta range is handled by the non-affine transform.
         """
-        mtransforms.Affine2DBase.__init__(self)
+        super().__init__()
         self._scale_transform = scale_transform
         self._limits = limits
         self.set_children(scale_transform, limits)
@@ -150,7 +150,7 @@ class InvertedPolarTransform(mtransforms.Transform):
 
     def __init__(self, axis=None, use_rmin=True,
                  _apply_theta_transforms=True):
-        mtransforms.Transform.__init__(self)
+        super().__init__()
         self._axis = axis
         self._use_rmin = use_rmin
         self._apply_theta_transforms = _apply_theta_transforms
@@ -478,8 +478,7 @@ class _ThetaShift(mtransforms.ScaledTranslation):
         of the axes, or using the rlabel position (``'rlabel'``).
     """
     def __init__(self, axes, pad, mode):
-        mtransforms.ScaledTranslation.__init__(self, pad, pad,
-                                               axes.figure.dpi_scale_trans)
+        super().__init__(pad, pad, axes.figure.dpi_scale_trans)
         self.set_children(axes._realViewLim)
         self.axes = axes
         self.mode = mode
@@ -509,7 +508,7 @@ def get_matrix(self):
                 pady = np.sin(angle + np.pi / 2)
 
             self._t = (self.pad * padx / 72, self.pad * pady / 72)
-        return mtransforms.ScaledTranslation.get_matrix(self)
+        return super().get_matrix()
 
 
 class RadialTick(maxis.YTick):
@@ -731,7 +730,7 @@ class _WedgeBbox(mtransforms.Bbox):
         Bbox determining the origin for the wedge, if different from *viewLim*
     """
     def __init__(self, center, viewLim, originLim, **kwargs):
-        mtransforms.Bbox.__init__(self, [[0, 0], [1, 1]], **kwargs)
+        super().__init__([[0, 0], [1, 1]], **kwargs)
         self._center = center
         self._viewLim = viewLim
         self._originLim = originLim
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -206,7 +206,7 @@ class LogTransform(Transform):
 
     @cbook._rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, base, nonpositive='clip'):
-        Transform.__init__(self)
+        super().__init__()
         if base <= 0 or base == 1:
             raise ValueError('The log base cannot be <= 0 or == 1')
         self.base = base
@@ -247,7 +247,7 @@ class InvertedLogTransform(Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base):
-        Transform.__init__(self)
+        super().__init__()
         self.base = base
 
     def __str__(self):
@@ -373,7 +373,7 @@ class SymmetricalLogTransform(Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base, linthresh, linscale):
-        Transform.__init__(self)
+        super().__init__()
         if base <= 1.0:
             raise ValueError("'base' must be larger than 1")
         if linthresh <= 0.0:
@@ -405,7 +405,7 @@ class InvertedSymmetricalLogTransform(Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base, linthresh, linscale):
-        Transform.__init__(self)
+        super().__init__()
         symlog = SymmetricalLogTransform(base, linthresh, linscale)
         self.base = base
         self.linthresh = linthresh
@@ -517,7 +517,7 @@ class LogitTransform(Transform):
 
     @cbook._rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, nonpositive='mask'):
-        Transform.__init__(self)
+        super().__init__()
         cbook._check_in_list(['mask', 'clip'], nonpositive=nonpositive)
         self._nonpositive = nonpositive
         self._clip = {"clip": True, "mask": False}[nonpositive]
@@ -543,7 +543,7 @@ class LogisticTransform(Transform):
 
     @cbook._rename_parameter("3.3", "nonpos", "nonpositive")
     def __init__(self, nonpositive='mask'):
-        Transform.__init__(self)
+        super().__init__()
         self._nonpositive = nonpositive
 
     def transform_non_affine(self, a):
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -22,7 +22,7 @@ class AssertingNonAffineTransform(mtransforms.Transform):
         is_affine = False
 
         def __init__(self, *args, **kwargs):
-            mtransforms.Transform.__init__(self, *args, **kwargs)
+            super().__init__(*args, **kwargs)
             self.raise_on_transform = False
             self.underlying_transform = mtransforms.Affine2D().scale(10, 10)
 
@@ -219,7 +219,7 @@ class NonAffineForTest(mtransforms.Transform):
 
     def __init__(self, real_trans, *args, **kwargs):
         self.real_trans = real_trans
-        mtransforms.Transform.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def transform_non_affine(self, values):
         return self.real_trans.transform(values)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -770,7 +770,7 @@ def __init__(self, points, **kwargs):
         points : ndarray
             A 2x2 numpy array of the form ``[[x0, y0], [x1, y1]]``.
         """
-        BboxBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         points = np.asarray(points, float)
         if points.shape != (2, 2):
             raise ValueError('Bbox points must be of the form '
@@ -791,7 +791,7 @@ def __init__(self, points, **kwargs):
 
         def invalidate(self):
             self._check(self._points)
-            TransformNode.invalidate(self)
+            super().invalidate()
 
     @staticmethod
     def unit():
@@ -1030,7 +1030,7 @@ def __init__(self, bbox, transform, **kwargs):
             raise ValueError(
                 "The input and output dimensions of 'transform' must be 2")
 
-        BboxBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._bbox = bbox
         self._transform = transform
         self.set_children(bbox, transform)
@@ -1107,7 +1107,7 @@ def __init__(self, bbox, x0=None, y0=None, x1=None, y1=None, **kwargs):
         if not bbox.is_bbox:
             raise ValueError("'bbox' is not a bbox")
 
-        BboxBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._bbox = bbox
         self.set_children(bbox)
         self._points = None
@@ -1700,7 +1700,7 @@ class AffineBase(Transform):
     is_affine = True
 
     def __init__(self, *args, **kwargs):
-        Transform.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._inverted = None
 
     def __array__(self, *args, **kwargs):
@@ -1839,7 +1839,7 @@ def __init__(self, matrix=None, **kwargs):
 
         If *matrix* is None, initialize with the identity transform.
         """
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         if matrix is None:
             # A bit faster than np.identity(3).
             matrix = IdentityTransform._mtx.copy()
@@ -2288,7 +2288,7 @@ def __init__(self, a, b, **kwargs):
         self.input_dims = a.input_dims
         self.output_dims = b.output_dims
 
-        Transform.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._a = a
         self._b = b
         self.set_children(a, b)
@@ -2314,8 +2314,8 @@ def _invalidate_internal(self, value, invalidating_node):
                 (not self._a.is_affine or invalidating_node is self._a)):
             value = Transform.INVALID
 
-        Transform._invalidate_internal(self, value=value,
-                                       invalidating_node=invalidating_node)
+        super()._invalidate_internal(value=value,
+                                     invalidating_node=invalidating_node)
 
     def __eq__(self, other):
         if isinstance(other, (CompositeGenericTransform, CompositeAffine2D)):
@@ -2401,7 +2401,7 @@ def __init__(self, a, b, **kwargs):
         self.input_dims = a.input_dims
         self.output_dims = b.output_dims
 
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._a = a
         self._b = b
         self.set_children(a, b)
@@ -2472,7 +2472,7 @@ def __init__(self, boxin, boxout, **kwargs):
         if not boxin.is_bbox or not boxout.is_bbox:
             raise ValueError("'boxin' and 'boxout' must be bbox")
 
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._boxin = boxin
         self._boxout = boxout
         self.set_children(boxin, boxout)
@@ -2516,7 +2516,7 @@ def __init__(self, boxout, **kwargs):
         if not boxout.is_bbox:
             raise ValueError("'boxout' must be bbox")
 
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._boxout = boxout
         self.set_children(boxout)
         self._mtx = None
@@ -2570,7 +2570,7 @@ def __init__(self, boxin, **kwargs):
         if not boxin.is_bbox:
             raise ValueError("'boxin' must be bbox")
 
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._boxin = boxin
         self.set_children(boxin)
         self._mtx = None
@@ -2601,7 +2601,7 @@ class ScaledTranslation(Affine2DBase):
     have been transformed by *scale_trans*.
     """
     def __init__(self, xt, yt, scale_trans, **kwargs):
-        Affine2DBase.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._t = (xt, yt)
         self._scale_trans = scale_trans
         self.set_children(scale_trans)
@@ -2671,7 +2671,7 @@ def __init__(self, path, transform):
         transform : `Transform`
         """
         cbook._check_isinstance(Transform, transform=transform)
-        TransformNode.__init__(self)
+        super().__init__()
         self._path = path
         self._transform = transform
         self.set_children(transform)
