Merge pull request #15987 from meeseeksmachine/auto-backport-of-pr-15886-on-v3.2.x

timhoffm · web-flow · commit a19699fff0a3 · 2019-12-22T16:59:39.000+01:00
Backport PR #15886 on branch v3.2.x (Fix Annotation using different units and different coords on x/y.)
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 import io
 import warnings
 
@@ -579,6 +580,18 @@ def test_annotation_update():
                            rtol=1e-6)
 
 
+@check_figures_equal(extensions=["png"])
+def test_annotation_units(fig_test, fig_ref):
+    ax = fig_test.add_subplot()
+    ax.plot(datetime.now(), 1, "o")  # Implicitly set axes extents.
+    ax.annotate("x", (datetime.now(), 0.5), xycoords=("data", "axes fraction"),
+                # This used to crash before.
+                xytext=(0, 0), textcoords="offset points")
+    ax = fig_ref.add_subplot()
+    ax.plot(datetime.now(), 1, "o")
+    ax.annotate("x", (datetime.now(), 0.5), xycoords=("data", "axes fraction"))
+
+
 @image_comparison(['large_subscript_title.png'], style='mpl20')
 def test_large_subscript_title():
     # Remove this line when this test image is regenerated.
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1863,19 +1863,12 @@ def is_offset(s):
             return isinstance(s, str) and s.split()[0] == "offset"
 
         if isinstance(self.xycoords, tuple):
-            s1, s2 = self.xycoords
-            if is_offset(s1) or is_offset(s2):
+            if any(map(is_offset, self.xycoords)):
                 raise ValueError("xycoords should not be an offset coordinate")
-            x, y = self.xy
-            x1, y1 = self._get_xy(renderer, x, y, s1)
-            x2, y2 = self._get_xy(renderer, x, y, s2)
-            return x1, y2
         elif is_offset(self.xycoords):
             raise ValueError("xycoords should not be an offset coordinate")
-        else:
-            x, y = self.xy
-            return self._get_xy(renderer, x, y, self.xycoords)
-        #raise RuntimeError("must be defined by the derived class")
+        x, y = self.xy
+        return self._get_xy(renderer, x, y, self.xycoords)
 
     # def _get_bbox(self, renderer):
     #     if hasattr(bbox, "bounds"):
