Merge pull request #13279 from anntzer/docwarn

jklymak · web-flow · commit fc695b28d48c · 2019-01-24T19:04:42.000-08:00
Remove a useless catch_warnings() from example.
diff --git a/examples/subplots_axes_and_figures/demo_tight_layout.py b/examples/subplots_axes_and_figures/demo_tight_layout.py
@@ -100,9 +100,7 @@ def example_plot(ax):
 
 fig = plt.figure()
 
-import matplotlib.gridspec as gridspec
-
-gs1 = gridspec.GridSpec(3, 1)
+gs1 = fig.add_gridspec(3, 1)
 ax1 = fig.add_subplot(gs1[0])
 ax2 = fig.add_subplot(gs1[1])
 ax3 = fig.add_subplot(gs1[2])
@@ -111,24 +109,19 @@ def example_plot(ax):
 example_plot(ax2)
 example_plot(ax3)
 
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore", UserWarning)
-    # This raises warnings since tight layout cannot
-    # handle gridspec automatically. We are going to
-    # do that manually so we can filter the warning.
-    gs1.tight_layout(fig, rect=[None, None, 0.45, None])
+gs1.tight_layout(fig, rect=[None, None, 0.45, None])
 
-gs2 = gridspec.GridSpec(2, 1)
+gs2 = fig.add_gridspec(2, 1)
 ax4 = fig.add_subplot(gs2[0])
 ax5 = fig.add_subplot(gs2[1])
 
 example_plot(ax4)
 example_plot(ax5)
 
 with warnings.catch_warnings():
-    # This raises warnings since tight layout cannot
-    # handle gridspec automatically. We are going to
-    # do that manually so we can filter the warning.
+    # gs2.tight_layout cannot handle the subplots from the first gridspec
+    # (gs1), so it will raise a warning. We are going to match the gridspecs
+    # manually so we can filter the warning away.
     warnings.simplefilter("ignore", UserWarning)
     gs2.tight_layout(fig, rect=[0.45, None, None, None])
 
@@ -153,6 +146,6 @@ def example_plot(ax):
 import matplotlib
 matplotlib.pyplot.tight_layout
 matplotlib.figure.Figure.tight_layout
+matplotlib.figure.Figure.add_gridspec
 matplotlib.figure.Figure.add_subplot
 matplotlib.pyplot.subplot2grid
-matplotlib.gridspec.GridSpec
