MNT: simplify generating GridSpec

tacaswell · tacaswell · commit 5a92cb02c594 · 2020-02-29T19:22:23.000-05:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1677,7 +1677,7 @@ def _do_layout(gs, layout, unique_ids, nested):
 
         layout = np.asarray(layout, dtype=object)
         rows, cols = layout.shape
-        gs = GridSpec(rows, cols, figure=self, **gridspec_kw)
+        gs = self.add_gridspec(rows, cols, **gridspec_kw)
         return _do_layout(gs, layout, *_process_layout(layout))
 
     def delaxes(self, ax):
diff --git a/lib/matplotlib/tests/test_build_grid.py b/lib/matplotlib/tests/test_build_grid.py
@@ -10,7 +10,7 @@ def test_basic(fig_test, fig_ref):
     for k, ax in grid_axes.items():
         ax.set_title(k)
 
-    gs = gridspec.GridSpec(2, 3, figure=fig_ref)
+    gs = fig_ref.add_gridspec(2, 3)
     axA = fig_ref.add_subplot(gs[:1, :2])
     axA.set_title("A")
 
@@ -35,7 +35,7 @@ def test_recursive(fig_test, fig_ref):
     for k, ax in grid_axes.items():
         ax.set_title(k)
 
-    gs = gridspec.GridSpec(2, 1, figure=fig_ref)
+    gs = fig_ref.add_gridspec(2, 1)
     axF = fig_ref.add_subplot(gs[0, 0])
     axF.set_title("F")
 
