Merge pull request #15747 from anntzer/annotationinit

QuLogic · web-flow · commit 2ff579d1b381 · 2020-03-23T22:20:19.000-04:00
Move Text init to end of Annotation init.
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1734,27 +1734,23 @@ def transform(renderer) -> Transform
             xytext = self.xy
         x, y = xytext
 
-        Text.__init__(self, x, y, text, **kwargs)
-
         self.arrowprops = arrowprops
-
         if arrowprops is not None:
+            arrowprops = arrowprops.copy()
             if "arrowstyle" in arrowprops:
-                arrowprops = self.arrowprops.copy()
                 self._arrow_relpos = arrowprops.pop("relpos", (0.5, 0.5))
             else:
                 # modified YAArrow API to be used with FancyArrowPatch
-                shapekeys = ('width', 'headwidth', 'headlength',
-                             'shrink', 'frac')
-                arrowprops = dict()
-                for key, val in self.arrowprops.items():
-                    if key not in shapekeys:
-                        arrowprops[key] = val  # basic Patch properties
-            self.arrow_patch = FancyArrowPatch((0, 0), (1, 1),
-                                               **arrowprops)
+                for key in [
+                        'width', 'headwidth', 'headlength', 'shrink', 'frac']:
+                    arrowprops.pop(key, None)
+            self.arrow_patch = FancyArrowPatch((0, 0), (1, 1), **arrowprops)
         else:
             self.arrow_patch = None
 
+        # Must come last, as some kwargs may be propagated to arrow_patch.
+        Text.__init__(self, x, y, text, **kwargs)
+
     def contains(self, event):
         inside, info = self._default_contains(event)
         if inside is not None:
