tight_layout: Use a different default gridspec

tomspur · tomspur · commit 9195a88de9ba · 2015-07-03T19:56:57.000+02:00
This commit adds a default gridspec to tight_layout. It helps to build a better
wimage when using tight_layout with figures that do not (yet) implement their
own gridspec. This does not affect figures that do not use tight_layout and
only improves the case with tight_layout at least in my testcases.

The warning, that warns from the usage of figures that have no gridspec
implemented is retained.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1703,10 +1703,6 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None,
                                    get_subplotspec_list)
 
         subplotspec_list = get_subplotspec_list(self.axes)
-        if None in subplotspec_list:
-            warnings.warn("This figure includes Axes that are not "
-                          "compatible with tight_layout, so its "
-                          "results might be incorrect.")
 
         if renderer is None:
             renderer = get_renderer(self)
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -298,10 +298,6 @@ def tight_layout(self, fig, renderer=None, pad=1.08, h_pad=None, w_pad=None, rec
                                    get_renderer)
 
         subplotspec_list = get_subplotspec_list(fig.axes, grid_spec=self)
-        if None in subplotspec_list:
-            warnings.warn("This figure includes Axes that are not "
-                          "compatible with tight_layout, so its "
-                          "results might be incorrect.")
 
         if renderer is None:
             renderer = get_renderer(fig)
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -12,6 +12,7 @@
 import warnings
 
 import matplotlib
+import matplotlib.gridspec as gridspec
 from matplotlib.transforms import TransformedBbox, Bbox
 
 from matplotlib.font_manager import FontProperties
@@ -233,8 +234,8 @@ def get_subplotspec_list(axes_list, grid_spec=None):
     instance of axes that does not support subplotspec, None is
     inserted in the list.
 
-    If grid_spec is given, None is inserted for those not from
-    the given grid_spec.
+    If grid_spec is given, GridSpec(1, 1) is inserted and a warning emited for
+    those not from the given grid_spec.
 
     """
     subplotspec_list = []
@@ -253,7 +254,10 @@ def get_subplotspec_list(axes_list, grid_spec=None):
             elif gs.locally_modified_subplot_params():
                 subplotspec = None
         else:
-            subplotspec = None
+            warnings.warn("This figure includes Axes that are not "
+                          "compatible with tight_layout, so its "
+                          "results might be incorrect.")
+            subplotspec = gridspec.GridSpec(1, 1)
 
         subplotspec_list.append(subplotspec)
 
