Use super() more in collections and containers.

QuLogic · QuLogic · commit 0414b3ffac91 · 2020-07-23T01:41:08.000-04:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -930,7 +930,7 @@ def set_sizes(self, sizes, dpi=72.0):
     @artist.allow_rasterization
     def draw(self, renderer):
         self.set_sizes(self._sizes, self.figure.dpi)
-        Collection.draw(self, renderer)
+        super().draw(renderer)
 
 
 class PathCollection(_CollectionWithSizes):
@@ -1122,7 +1122,7 @@ def __init__(self, verts, sizes=None, closed=True, **kwargs):
         **kwargs
             Forwarded to `.Collection`.
         """
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.set_sizes(sizes)
         self.set_verts(verts, closed)
         self.stale = True
@@ -1212,7 +1212,7 @@ def __init__(self, xranges, yrange, **kwargs):
                   (xmin + xwidth, ymax),
                   (xmin + xwidth, ymin),
                   (xmin, ymin)] for xmin, xwidth in xranges]
-        PolyCollection.__init__(self, verts, **kwargs)
+        super().__init__(verts, **kwargs)
 
     @classmethod
     def span_where(cls, x, ymin, ymax, where, **kwargs):
@@ -1272,7 +1272,7 @@ def __init__(self,
                 transOffset=ax.transData,
                 )
         """
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.set_sizes(sizes)
         self._numsides = numsides
         self._paths = [self._path_generator(numsides)]
@@ -1292,6 +1292,8 @@ def draw(self, renderer):
             transforms.Affine2D(x).rotate(-self._rotation).get_matrix()
             for x in self._transforms
         ]
+        # Explicitly not super().draw, because set_sizes must be called before
+        # updating self._transforms.
         Collection.draw(self, renderer)
 
 
@@ -1378,8 +1380,7 @@ def __init__(self, segments,     # Can be None.
             antialiaseds = (mpl.rcParams['lines.antialiased'],)
 
         colors = mcolors.to_rgba_array(colors)
-        Collection.__init__(
-            self,
+        super().__init__(
             edgecolors=colors,
             facecolors=facecolors,
             linewidths=linewidths,
@@ -1520,13 +1521,10 @@ def __init__(self,
         --------
         .. plot:: gallery/lines_bars_and_markers/eventcollection_demo.py
         """
-        LineCollection.__init__(self,
-                                [],
-                                linewidths=linewidth,
-                                colors=color,
-                                antialiaseds=antialiased,
-                                linestyles=linestyle,
-                                **kwargs)
+        super().__init__([],
+                         linewidths=linewidth, linestyles=linestyle,
+                         colors=color, antialiaseds=antialiased,
+                         **kwargs)
         self._is_horizontal = True  # Initial value, may be switched below.
         self._linelength = linelength
         self._lineoffset = lineoffset
@@ -1677,7 +1675,7 @@ def __init__(self, sizes, **kwargs):
         **kwargs
             Forwarded to `.Collection`.
         """
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self.set_sizes(sizes)
         self.set_transform(transforms.IdentityTransform())
         self._paths = [mpath.Path.unit_circle()]
@@ -1711,7 +1709,7 @@ def __init__(self, widths, heights, angles, units='points', **kwargs):
         **kwargs
             Forwarded to `Collection`.
         """
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._widths = 0.5 * np.asarray(widths).ravel()
         self._heights = 0.5 * np.asarray(heights).ravel()
         self._angles = np.deg2rad(angles).ravel()
@@ -1765,7 +1763,7 @@ def _set_transforms(self):
     @artist.allow_rasterization
     def draw(self, renderer):
         self._set_transforms()
-        Collection.draw(self, renderer)
+        super().draw(renderer)
 
 
 class PatchCollection(Collection):
@@ -1813,7 +1811,7 @@ def determine_facecolor(patch):
             kwargs['linestyles'] = [p.get_linestyle() for p in patches]
             kwargs['antialiaseds'] = [p.get_antialiased() for p in patches]
 
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
         self.set_paths(patches)
 
@@ -1830,7 +1828,7 @@ class TriMesh(Collection):
     A triangular mesh is a `~matplotlib.tri.Triangulation` object.
     """
     def __init__(self, triangulation, **kwargs):
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._triangulation = triangulation
         self._shading = 'gouraud'
         self._is_filled = True
@@ -1918,7 +1916,7 @@ class QuadMesh(Collection):
     """
     def __init__(self, meshWidth, meshHeight, coordinates,
                  antialiased=True, shading='flat', **kwargs):
-        Collection.__init__(self, **kwargs)
+        super().__init__(**kwargs)
         self._meshWidth = meshWidth
         self._meshHeight = meshHeight
         # By converting to floats now, we can avoid that on every draw.
diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py
@@ -65,7 +65,7 @@ class BarContainer(Container):
     def __init__(self, patches, errorbar=None, **kwargs):
         self.patches = patches
         self.errorbar = errorbar
-        Container.__init__(self, patches, **kwargs)
+        super().__init__(patches, **kwargs)
 
 
 class ErrorbarContainer(Container):
@@ -97,7 +97,7 @@ def __init__(self, lines, has_xerr=False, has_yerr=False, **kwargs):
         self.lines = lines
         self.has_xerr = has_xerr
         self.has_yerr = has_yerr
-        Container.__init__(self, lines, **kwargs)
+        super().__init__(lines, **kwargs)
 
 
 class StemContainer(Container):
@@ -132,4 +132,4 @@ def __init__(self, markerline_stemlines_baseline, **kwargs):
         self.markerline = markerline
         self.stemlines = stemlines
         self.baseline = baseline
-        Container.__init__(self, markerline_stemlines_baseline, **kwargs)
+        super().__init__(markerline_stemlines_baseline, **kwargs)
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -495,10 +495,8 @@ def __init__(self, ax, *args,
         self.transform = kw.pop('transform', ax.transData)
         kw.setdefault('facecolors', color)
         kw.setdefault('linewidths', (0,))
-        mcollections.PolyCollection.__init__(self, [], offsets=self.XY,
-                                             transOffset=self.transform,
-                                             closed=False,
-                                             **kw)
+        super().__init__([], offsets=self.XY, transOffset=self.transform,
+                         closed=False, **kw)
         self.polykw = kw
         self.set_UVC(U, V, C)
         self._initialized = False
@@ -561,7 +559,7 @@ def draw(self, renderer):
         verts = self._make_verts(self.U, self.V, self.angles)
         self.set_verts(verts, closed=False)
         self._new_UV = False
-        mcollections.PolyCollection.draw(self, renderer)
+        super().draw(renderer)
         self.stale = False
 
     def set_UVC(self, U, V, C=None):
@@ -971,9 +969,8 @@ def __init__(self, ax, *args,
 
         # Make a collection
         barb_size = self._length ** 2 / 4  # Empirically determined
-        mcollections.PolyCollection.__init__(self, [], (barb_size,),
-                                             offsets=xy,
-                                             transOffset=transform, **kw)
+        super().__init__([], (barb_size,), offsets=xy, transOffset=transform,
+                         **kw)
         self.set_transform(transforms.IdentityTransform())
 
         self.set_UVC(u, v, c)
@@ -1213,7 +1210,7 @@ def set_offsets(self, xy):
             self.x.ravel(), self.y.ravel(), self.u, self.v)
         _check_consistent_shapes(x, y, u, v)
         xy = np.column_stack((x, y))
-        mcollections.PolyCollection.set_offsets(self, xy)
+        super().set_offsets(xy)
         self.stale = True
 
     barbs_doc = _barbs_doc
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -624,7 +624,7 @@ def set_verts(self, verts, closed=True):
         """Set 3D vertices."""
         self.get_vector(verts)
         # 2D verts will be updated at draw time
-        PolyCollection.set_verts(self, [], False)
+        super().set_verts([], False)
         self._closed = closed
 
     def set_verts_and_codes(self, verts, codes):
@@ -707,11 +707,11 @@ def do_3d_projection(self, renderer):
             return np.nan
 
     def set_facecolor(self, colors):
-        PolyCollection.set_facecolor(self, colors)
+        super().set_facecolor(colors)
         self._facecolors3d = PolyCollection.get_facecolor(self)
 
     def set_edgecolor(self, colors):
-        PolyCollection.set_edgecolor(self, colors)
+        super().set_edgecolor(colors)
         self._edgecolors3d = PolyCollection.get_edgecolor(self)
 
     def set_alpha(self, alpha):
