TST: add new api to couple tests in test_constrainedlayout

jklymak · jklymak · commit 65cdd5720f7f · 2018-04-10T09:54:13.000-07:00
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -103,9 +103,9 @@ def test_constrained_layout5():
 def test_constrained_layout6():
     'Test constrained_layout for nested gridspecs'
     fig = plt.figure(constrained_layout=True)
-    gs = gridspec.GridSpec(1, 2, figure=fig)
-    gsl = gridspec.GridSpecFromSubplotSpec(2, 2, gs[0])
-    gsr = gridspec.GridSpecFromSubplotSpec(1, 2, gs[1])
+    gs = fig.add_gridspec(1, 2, figure=fig)
+    gsl = gs[0].subgridspec(2, 2)
+    gsr = gs[1].subgridspec(1, 2)
     axsl = []
     for gs in gsl:
         ax = fig.add_subplot(gs)
@@ -128,7 +128,7 @@ def test_constrained_layout7():
     with pytest.warns(UserWarning, match='Calling figure.constrained_layout, '
                             'but figure not setup to do constrained layout'):
         fig = plt.figure(constrained_layout=True)
-        gs = gridspec.GridSpec(1, 2)
+        gs = fig.add_gridspec(1, 2)
         gsl = gridspec.GridSpecFromSubplotSpec(2, 2, gs[0])
         gsr = gridspec.GridSpecFromSubplotSpec(1, 2, gs[1])
         axsl = []
