FIX

jklymak · jklymak · commit 4a4391be8450 · 2020-05-06T22:06:53.000-07:00
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -200,7 +200,8 @@ def get_grid_positions(self, fig, raw=False):
     @staticmethod
     def _check_gridspec_exists(figure, nrows, ncols):
         """
-        Check if the figure already has a gridspec with these dimensions...
+        Check if the figure already has a gridspec with these dimensions,
+        or create a new one
         """
         gs = None
         for ax in figure.get_axes():
@@ -217,6 +218,8 @@ def _check_gridspec_exists(figure, nrows, ncols):
                  (nrow, ncol) = ggs.get_geometry()
                  if nrow == nrows and ncol == ncols:
                      gs = ggs
+        if gs is None:
+            gs = GridSpec(nrows, ncols, figure=figure)
         return gs
 
 
@@ -583,8 +586,7 @@ def _from_subplot_args(figure, args):
                             f"{len(args)} were given")
 
         gs = GridSpec._check_gridspec_exists(figure, rows, cols)
-        if gs is None:
-            gs = GridSpec(rows, cols, figure=figure)
+        
         return gs[ii-1:jj]
 
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1239,8 +1239,6 @@ def subplot2grid(shape, loc, rowspan=1, colspan=1, fig=None, **kwargs):
 
     rows, cols = shape
     gs = GridSpec._check_gridspec_exists(fig, rows, cols)
-    if gs is None:
-        gs = GridSpec(rows, cols, figure=fig)
 
     subplotspec = gs.new_subplotspec(loc, rowspan=rowspan, colspan=colspan)
     ax = fig.add_subplot(subplotspec, **kwargs)
