FIX

jklymak · jklymak · commit a7777031f6e4 · 2020-05-25T11:35:20.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -384,6 +384,7 @@ def show(self, warn=True):
         AttributeError.
 
         .. warning::
+
             This does not manage an GUI event loop. Consequently, the figure
             may only be shown briefly or not shown at all if you or your
             environment are not managing an event loop.
@@ -1264,13 +1265,16 @@ def add_subplot(self, *args, **kwargs):
 
         Parameters
         ----------
-        *args, int or (int, int, int) or `SubplotSpec`, default: (1, 1, 1)
+        *args : int, (int, int, *index*), or `.SubplotSpec`, default: (1, 1, 1)
             The position of the subplot described by one of
 
             - Three integers (*nrows*, *ncols*, *index*). The subplot will
               take the *index* position on a grid with *nrows* rows and
               *ncols* columns. *index* starts at 1 in the upper left corner
-              and increases to the right.
+              and increases to the right.  *index* can also be a two-tuple
+              specifying the (*first*, *last*) indices (1-based, and including
+              *last*) of the subplot, e.g., ``fig.add_subplot(3, 1, (1, 2))``
+              makes a subplot that spans the upper 2/3 of the figure.
             - A 3-digit integer. The digits are interpreted as if given
               separately as three single-digit integers, i.e.
               ``fig.add_subplot(235)`` is the same as
@@ -1362,48 +1366,27 @@ def add_subplot(self, *args, **kwargs):
             raise TypeError(
                 "add_subplot() got an unexpected keyword argument 'figure'")
 
-        nargs = len(args)
-        if nargs == 0:
-            args = (1, 1, 1)
-        elif nargs == 1:
-            if isinstance(args[0], Integral):
-                if not 100 <= args[0] <= 999:
-                    raise ValueError(f"Integer subplot specification must be "
-                                     f"a three-digit number, not {args[0]}")
-                args = tuple(map(int, str(args[0])))
-            elif isinstance(args[0], (SubplotBase, SubplotSpec)):
-                pass  # no further validation or normalization needed
-            else:
-                raise TypeError('Positional arguments are not a valid '
-                                'position specification.')
-        elif nargs == 3:
-            for arg in args:
-                if not isinstance(arg, Integral):
-                    cbook.warn_deprecated(
-                        "3.3",
-                        message="Passing non-integers as three-element "
-                                "position specification is deprecated since "
-                                "%(since)s and will be removed %(removal)s.")
-            args = tuple(map(int, args))
-        else:
-            raise TypeError(f'add_subplot() takes 1 or 3 positional arguments '
-                            f'but {nargs} were given')
-
-        if isinstance(args[0], SubplotBase):
+        if len(args) == 1 and isinstance(args[0], SubplotBase):
             ax = args[0]
             if ax.get_figure() is not self:
                 raise ValueError("The Subplot must have been created in "
                                  "the present figure")
             # make a key for the subplot (which includes the axes object id
             # in the hash)
             key = self._make_key(*args, **kwargs)
+
         else:
+            if not args:
+                args = (1, 1, 1)
+            # Normalize correct ijk values to (i, j, k) here so that
+            # add_subplot(111) == add_subplot(1, 1, 1).  Invalid values will
+            # trigger errors later (via SubplotSpec._from_subplot_args).
+            if (len(args) == 1 and isinstance(args[0], Integral)
+                    and 100 <= args[0] <= 999):
+                args = tuple(map(int, str(args[0])))
             projection_class, kwargs, key = \
                 self._process_projection_requirements(*args, **kwargs)
-
-            # try to find the axes with this key in the stack
-            ax = self._axstack.get(key)
-
+            ax = self._axstack.get(key)  # search axes with this key in stack
             if ax is not None:
                 if isinstance(ax, projection_class):
                     # the axes already existed, so set it as active & return
@@ -1416,7 +1399,6 @@ def add_subplot(self, *args, **kwargs):
                     # Without this, add_subplot would be simpler and
                     # more similar to add_axes.
                     self._axstack.remove(ax)
-
             ax = subplot_class_factory(projection_class)(self, *args, **kwargs)
 
         return self._add_axes_internal(key, ax)
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -190,9 +190,9 @@ def test_add_subplot_invalid():
     with pytest.raises(ValueError, match='num must be 1 <= num <= 4'):
         fig.add_subplot(2, 2, 5)
 
-    with pytest.raises(ValueError, match='Integer subplot specification must'):
+    with pytest.raises(ValueError, match='must be a three-digit integer'):
         fig.add_subplot(42)
-    with pytest.raises(ValueError, match='Integer subplot specification must'):
+    with pytest.raises(ValueError, match='must be a three-digit integer'):
         fig.add_subplot(1000)
 
     with pytest.raises(TypeError, match='takes 1 or 3 positional arguments '
@@ -566,38 +566,3 @@ def test_add_subplot_twotuple():
     assert ax4.get_subplotspec().colspan == range(0, 2)
     with pytest.raises(IndexError):
         fig.add_subplot(3, 2, (6, 3))
-
-
-def test_add_subplot_twotuple():
-    fig = plt.figure()
-    ax2 = fig.add_subplot(3, 2, (3, 5))
-    assert ax2.get_subplotspec().rowspan == range(1, 3)
-    assert ax2.get_subplotspec().colspan == range(0, 1)
-    ax3 = fig.add_subplot(3, 2, (4, 6))
-    assert ax3.get_subplotspec().rowspan == range(1, 3)
-    assert ax3.get_subplotspec().colspan == range(1, 2)
-    ax4 = fig.add_subplot(3, 2, (3, 6))
-    assert ax4.get_subplotspec().rowspan == range(1, 3)
-    assert ax4.get_subplotspec().colspan == range(0, 2)
-
-
-def test_reuse_gridspec():
-    fig = plt.figure()
-    ax = [None] * 9
-    for i in range(9):
-        ax[i] = fig.add_subplot(3, 3, i + 1)
-    for i in range(1, 9):
-        assert (ax[i].get_subplotspec().get_gridspec() ==
-                ax[0].get_subplotspec().get_gridspec())
-
-    fig = plt.figure()
-    ax1 = fig.add_subplot(3, 3, (1, 7))
-    ax2 = fig.add_subplot(3, 3, (6, 9))
-    assert (ax1.get_subplotspec().get_gridspec() ==
-            ax2.get_subplotspec().get_gridspec())
-
-    fig = plt.figure()
-    ax1 = plt.subplot2grid((3, 3), (0, 0))
-    ax2 = plt.subplot2grid((3, 3), (1, 1), colspan=2)
-    assert (ax1.get_subplotspec().get_gridspec() ==
-            ax2.get_subplotspec().get_gridspec())
