Use super() in patch classes.

QuLogic · QuLogic · commit 7cf9cb7044f4 · 2020-07-27T16:56:18.000-04:00
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -56,7 +56,7 @@ def __init__(self,
 
         %(Patch)s
         """
-        artist.Artist.__init__(self)
+        super().__init__()
 
         if linewidth is None:
             linewidth = mpl.rcParams['patch.linewidth']
@@ -232,7 +232,7 @@ def contains_points(self, points, radius=None):
 
     def update_from(self, other):
         # docstring inherited.
-        artist.Artist.update_from(self, other)
+        super().update_from(other)
         # For some properties we don't need or don't want to go through the
         # getters/setters, so we just copy them directly.
         self._edgecolor = other._edgecolor
@@ -644,7 +644,7 @@ def __init__(self, patch, ox, oy, props=None, **kwargs):
 
             %(Patch)s
         """
-        Patch.__init__(self)
+        super().__init__()
         self.patch = patch
         # Note: when removing props, we can directly pass kwargs to _update()
         # and remove self._props
@@ -683,7 +683,7 @@ def get_patch_transform(self):
 
     def draw(self, renderer):
         self._update_transform(renderer)
-        Patch.draw(self, renderer)
+        super().draw(renderer)
 
 
 class Rectangle(Patch):
@@ -730,7 +730,7 @@ def __init__(self, xy, width, height, angle=0.0, **kwargs):
             %(Patch)s
         """
 
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
         self._x0 = xy[0]
         self._y0 = xy[1]
@@ -910,7 +910,7 @@ def __init__(self, xy, numVertices, radius=5, orientation=0,
         self._poly_transform = transforms.Affine2D()
         self._update_transform()
 
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
     def _update_transform(self):
         self._poly_transform.clear() \
@@ -979,7 +979,7 @@ def __init__(self, path, **kwargs):
 
         %(Patch)s
         """
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._path = path
 
     def get_path(self):
@@ -1008,7 +1008,7 @@ def __init__(self, xy, closed=True, **kwargs):
 
         %(Patch)s
         """
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._closed = closed
         self.set_xy(xy)
 
@@ -1104,7 +1104,7 @@ def __init__(self, center, r, theta1, theta2, width=None, **kwargs):
 
         %(Patch)s
         """
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.center = center
         self.r, self.width = r, width
         self.theta1, self.theta2 = theta1, theta2
@@ -1356,11 +1356,7 @@ def __init__(self, xy, radius=5,
 
         %(Patch)s
         """
-        RegularPolygon.__init__(self, xy,
-                                resolution,
-                                radius,
-                                orientation=0,
-                                **kwargs)
+        super().__init__(xy, resolution, radius, orientation=0, **kwargs)
 
 
 class Ellipse(Patch):
@@ -1392,7 +1388,7 @@ def __init__(self, xy, width, height, angle=0, **kwargs):
 
         %(Patch)s
         """
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
         self._center = xy
         self._width, self._height = width, height
@@ -1518,7 +1514,7 @@ def __init__(self, xy, radius=5, **kwargs):
 
         %(Patch)s
         """
-        Ellipse.__init__(self, xy, radius * 2, radius * 2, **kwargs)
+        super().__init__(xy, radius * 2, radius * 2, **kwargs)
         self.radius = radius
 
     def set_radius(self, radius):
@@ -1599,7 +1595,7 @@ def __init__(self, xy, width, height, angle=0.0,
         if fill:
             raise ValueError("Arc objects can not be filled")
 
-        Ellipse.__init__(self, xy, width, height, angle, **kwargs)
+        super().__init__(xy, width, height, angle, **kwargs)
 
         self.theta1 = theta1
         self.theta2 = theta2
@@ -3614,7 +3610,7 @@ def __init__(self, xy, width, height,
         %(Patch)s
         """
 
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
         self._x = xy[0]
         self._y = xy[1]
@@ -3920,7 +3916,7 @@ def __init__(self, posA=None, posB=None, path=None,
         kwargs.setdefault("joinstyle", "round")
         kwargs.setdefault("capstyle", "round")
 
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
         if posA is not None and posB is not None and path is None:
             self._posA_posB = [posA, posB]
@@ -4271,18 +4267,15 @@ def __init__(self, xyA, xyB, coordsA, coordsB=None,
         self.axesA = axesA
         self.axesB = axesB
 
-        FancyArrowPatch.__init__(self,
-                                 posA=(0, 0), posB=(1, 1),
-                                 arrowstyle=arrowstyle,
-                                 connectionstyle=connectionstyle,
-                                 patchA=patchA,
-                                 patchB=patchB,
-                                 shrinkA=shrinkA,
-                                 shrinkB=shrinkB,
-                                 mutation_scale=mutation_scale,
-                                 mutation_aspect=mutation_aspect,
-                                 clip_on=clip_on,
-                                 **kwargs)
+        super().__init__(posA=(0, 0), posB=(1, 1),
+                         arrowstyle=arrowstyle,
+                         connectionstyle=connectionstyle,
+                         patchA=patchA, patchB=patchB,
+                         shrinkA=shrinkA, shrinkB=shrinkB,
+                         mutation_scale=mutation_scale,
+                         mutation_aspect=mutation_aspect,
+                         clip_on=clip_on,
+                         **kwargs)
         self._dpi_cor = dpi_cor
 
         # if True, draw annotation only if self.xy is inside the axes
@@ -4411,4 +4404,4 @@ def draw(self, renderer):
             self._renderer = renderer
         if not self.get_visible() or not self._check_xy(renderer):
             return
-        FancyArrowPatch.draw(self, renderer)
+        super().draw(renderer)
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -85,8 +85,8 @@ def __init__(self, xy, width, height,
         """
 
         # Call base
-        Rectangle.__init__(self, xy, width=width, height=height, fill=fill,
-                           edgecolor=edgecolor, facecolor=facecolor)
+        super().__init__(xy, width=width, height=height, fill=fill,
+                         edgecolor=edgecolor, facecolor=facecolor)
         self.set_clip_on(False)
         self.visible_edges = visible_edges
 
@@ -99,12 +99,12 @@ def __init__(self, xy, width, height,
                           horizontalalignment=loc, verticalalignment='center')
 
     def set_transform(self, trans):
-        Rectangle.set_transform(self, trans)
+        super().set_transform(trans)
         # the text does not get the transform!
         self.stale = True
 
     def set_figure(self, fig):
-        Rectangle.set_figure(self, fig)
+        super().set_figure(fig)
         self._text.set_figure(fig)
 
     def get_text(self):
@@ -136,7 +136,7 @@ def draw(self, renderer):
         if not self.get_visible():
             return
         # draw the rectangle
-        Rectangle.draw(self, renderer)
+        super().draw(renderer)
         # position the text
         self._set_text_position(renderer)
         self._text.draw(renderer)
diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py
@@ -154,7 +154,7 @@ def __init__(self, bbox, **kwargs):
             raise ValueError("transform should not be set")
 
         kwargs["transform"] = IdentityTransform()
-        Patch.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.bbox = bbox
 
     def get_path(self):
@@ -277,10 +277,10 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs):
 
         kwargs["transform"] = IdentityTransform()
         if 'fill' in kwargs:
-            Patch.__init__(self, **kwargs)
+            super().__init__(**kwargs)
         else:
             fill = bool({'fc', 'facecolor', 'color'}.intersection(kwargs))
-            Patch.__init__(self, fill=fill, **kwargs)
+            super().__init__(fill=fill, **kwargs)
         self.bbox1 = bbox1
         self.bbox2 = bbox2
         self.loc1 = loc1
@@ -333,7 +333,7 @@ def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs):
         """
         if "transform" in kwargs:
             raise ValueError("transform should not be set")
-        BboxConnector.__init__(self, bbox1, bbox2, loc1a, loc2a, **kwargs)
+        super().__init__(bbox1, bbox2, loc1a, loc2a, **kwargs)
         self.loc1b = loc1b
         self.loc2b = loc2b
 
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -296,7 +296,7 @@ class Patch3D(Patch):
     """
 
     def __init__(self, *args, zs=(), zdir='z', **kwargs):
-        Patch.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.set_3d_properties(zs, zdir)
 
     def set_3d_properties(self, verts, zs=0, zdir='z'):
@@ -327,6 +327,7 @@ class PathPatch3D(Patch3D):
     """
 
     def __init__(self, path, *, zs=(), zdir='z', **kwargs):
+        # Not super().__init__!
         Patch.__init__(self, **kwargs)
         self.set_3d_properties(path, zs, zdir)
 
