Use super() in hatch and path effects.

QuLogic · QuLogic · commit 8f34a328f2ad · 2020-07-27T16:57:27.000-04:00
diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py
@@ -130,31 +130,34 @@ def __init__(self, hatch, density):
         path = Path.unit_circle()
         self.shape_vertices = path.vertices
         self.shape_codes = path.codes
-        Shapes.__init__(self, hatch, density)
+        super().__init__(hatch, density)
 
 
 class SmallCircles(Circles):
     size = 0.2
 
     def __init__(self, hatch, density):
         self.num_rows = (hatch.count('o')) * density
-        Circles.__init__(self, hatch, density)
+        super().__init__(hatch, density)
 
 
 class LargeCircles(Circles):
     size = 0.35
 
     def __init__(self, hatch, density):
         self.num_rows = (hatch.count('O')) * density
-        Circles.__init__(self, hatch, density)
+        super().__init__(hatch, density)
 
 
+# TODO: __init__ and class attributes override all attributes set by
+# SmallCircles. Should this class derive from Circles instead?
 class SmallFilledCircles(SmallCircles):
     size = 0.1
     filled = True
 
     def __init__(self, hatch, density):
         self.num_rows = (hatch.count('.')) * density
+        # Not super().__init__!
         Circles.__init__(self, hatch, density)
 
 
@@ -169,7 +172,7 @@ def __init__(self, hatch, density):
         self.shape_codes = np.full(len(self.shape_vertices), Path.LINETO,
                                    dtype=Path.code_type)
         self.shape_codes[0] = Path.MOVETO
-        Shapes.__init__(self, hatch, density)
+        super().__init__(hatch, density)
 
 _hatch_types = [
     HorizontalHatch,
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
@@ -108,9 +108,8 @@ def draw_markers(
         if len(self._path_effects) == 1:
             # Call the base path effect function - this uses the unoptimised
             # approach of calling "draw_path" multiple times.
-            return RendererBase.draw_markers(self, gc, marker_path,
-                                             marker_trans, path, *args,
-                                             **kwargs)
+            return super().draw_markers(gc, marker_path, marker_trans, path,
+                                        *args, **kwargs)
 
         for path_effect in self._path_effects:
             renderer = self.copy_with_path_effect([path_effect])
@@ -127,9 +126,8 @@ def draw_path_collection(self, gc, master_transform, paths, *args,
         if len(self._path_effects) == 1:
             # Call the base path effect function - this uses the unoptimised
             # approach of calling "draw_path" multiple times.
-            return RendererBase.draw_path_collection(self, gc,
-                                                     master_transform, paths,
-                                                     *args, **kwargs)
+            return super().draw_path_collection(gc, master_transform, paths,
+                                                *args, **kwargs)
 
         for path_effect in self._path_effects:
             renderer = self.copy_with_path_effect([path_effect])
