Combine withEffect PathEffect definitions.

anntzer · anntzer · commit 5678ac0ecf9d · 2019-10-27T00:28:58.000+02:00
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
@@ -159,7 +159,26 @@ class Normal(AbstractPathEffect):
     The Normal PathEffect's sole purpose is to draw the original artist with
     no special path effect.
     """
-    pass
+
+
+def _make_with_effect(cls):
+    """
+    Generate a PathEffect combining the effect of *cls* and a normal draw.
+    """
+
+    class withEffect(cls):
+        def draw_path(self, renderer, gc, tpath, affine, rgbFace):
+            super().draw_path(renderer, gc, tpath, affine, rgbFace)
+            renderer.draw_path(gc, tpath, affine, rgbFace)
+
+    withEffect.__name__ = f"with{cls.__name__}"
+    withEffect.__doc__ = f"""
+    Adds a `.{cls.__name__}` and then draws the original Artist to avoid
+    needing to call `.Normal`.
+    """
+    # Docstring inheritance doesn't work for locally-defined subclasses.
+    withEffect.draw_path.__doc__ = cls.draw_path.__doc__
+    return withEffect
 
 
 class Stroke(AbstractPathEffect):
@@ -185,15 +204,7 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
         gc0.restore()
 
 
-class withStroke(Stroke):
-    """
-    Adds a simple :class:`Stroke` and then draws the
-    original Artist to avoid needing to call :class:`Normal`.
-
-    """
-    def draw_path(self, renderer, gc, tpath, affine, rgbFace):
-        Stroke.draw_path(self, renderer, gc, tpath, affine, rgbFace)
-        renderer.draw_path(gc, tpath, affine, rgbFace)
+withStroke = _make_with_effect(Stroke)
 
 
 class SimplePatchShadow(AbstractPathEffect):
@@ -262,15 +273,7 @@ def draw_path(self, renderer, gc, tpath, affine, rgbFace):
         gc0.restore()
 
 
-class withSimplePatchShadow(SimplePatchShadow):
-    """
-    Adds a simple :class:`SimplePatchShadow` and then draws the
-    original Artist to avoid needing to call :class:`Normal`.
-
-    """
-    def draw_path(self, renderer, gc, tpath, affine, rgbFace):
-        SimplePatchShadow.draw_path(self, renderer, gc, tpath, affine, rgbFace)
-        renderer.draw_path(gc, tpath, affine, rgbFace)
+withSimplePatchShadow = _make_with_effect(SimplePatchShadow)
 
 
 class SimpleLineShadow(AbstractPathEffect):
