TST: update message

jklymak · jklymak · commit 93142c6cde67 · 2020-05-25T10:50:22.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1265,27 +1265,16 @@ def add_subplot(self, *args, **kwargs):
 
         Parameters
         ----------
-<<<<<<< HEAD
-        *args : int, (int, int, *index*), or `.SubplotSpec`, default: (1, 1, 1)
-=======
-        *args, int, (int, int, *index*), or `SubplotSpec`, default: (1, 1, 1)
->>>>>>> FIX: allow start-stop subplot
+        *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
-<<<<<<< HEAD
-              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.
-=======
               and increases to the right. *index* can also be  a two-tuple
               specifying the (*start*, *stop*) indices of the subplot, i.e.,
               ``fig.add_subplot(3, 1, (1, 2))`` makes a subplot that spans the
               upper 2/3 of the figure.
->>>>>>> FIX: allow start-stop subplot
             - 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
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -690,8 +690,7 @@ def _from_subplot_args(figure, args):
                         f"Single argument to subplot must be a three-digit "
                         f"integer, not {arg}") from None
                 # num - 1 for converting from MATLAB to python indexing
-                ii = num
-                jj = num
+                i = j = num
         elif len(args) == 3:
             rows, cols, num = args
             if not (isinstance(rows, Integral) and isinstance(cols, Integral)):
@@ -704,14 +703,15 @@ def _from_subplot_args(figure, args):
                     i, j = map(int, num)
                 else:
                     i, j = num
-#                return gs[i-1:j]
             else:
                 if not isinstance(num, Integral):
                     cbook.warn_deprecated("3.3", message=message)
                     num = int(num)
                 if num < 1 or num > rows*cols:
                     raise ValueError(
                         f"num must be 1 <= num <= {rows*cols}, not {num}")
+                else:
+                    i = j = num
         else:
             raise TypeError(f"subplot() takes 1 or 3 positional arguments but "
                             f"{len(args)} were given")
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='must be a three-digit integer'):
+    with pytest.raises(ValueError, match='Integer subplot specification must'):
         fig.add_subplot(42)
-    with pytest.raises(ValueError, match='must be a three-digit integer'):
+    with pytest.raises(ValueError, match='Integer subplot specification must'):
         fig.add_subplot(1000)
 
     with pytest.raises(TypeError, match='takes 1 or 3 positional arguments '
