Merge pull request #17164 from QuLogic/add_axes-rect

efiring · web-flow · commit 5eea274fc0af · 2020-04-17T09:57:53.000-10:00
Fix Figure.add_axes(rect=...).
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1211,6 +1211,11 @@ def add_axes(self, *args, **kwargs):
                 "deprecated. You may want to use add_subplot() "
                 "instead.")
             return
+        elif 'rect' in kwargs:
+            if len(args):
+                raise TypeError(
+                    "add_axes() got multiple values for argument 'rect'")
+            args = (kwargs.pop('rect'), )
 
         # shortcut the projection "key" modifications later on, if an axes
         # with the exact args/kwargs exists, return it immediately.
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -150,7 +150,11 @@ def test_gca():
         # empty call to add_axes() will throw deprecation warning
         assert fig.add_axes() is None
 
-    ax1 = fig.add_axes([0, 0, 1, 1])
+    ax0 = fig.add_axes([0, 0, 1, 1])
+    assert fig.gca(projection='rectilinear') is ax0
+    assert fig.gca() is ax0
+
+    ax1 = fig.add_axes(rect=[0.1, 0.1, 0.8, 0.8])
     assert fig.gca(projection='rectilinear') is ax1
     assert fig.gca() is ax1
 
@@ -387,6 +391,9 @@ def test_invalid_figure_add_axes():
     with pytest.raises(ValueError):
         fig.add_axes((.1, .1, .5, np.nan))
 
+    with pytest.raises(TypeError, match="multiple values for argument 'rect'"):
+        fig.add_axes([0, 0, 1, 1], rect=[0, 0, 1, 1])
+
 
 def test_subplots_shareax_loglabels():
     fig, axs = plt.subplots(2, 2, sharex=True, sharey=True, squeeze=False)
