Fix tight_layout to handle empty figures

mollyrossow · mollyrossow · commit c34a74d55a6b · 2017-07-15T17:06:58.000-05:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1973,6 +1973,8 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None,
                                          renderer,
                                          pad=pad, h_pad=h_pad, w_pad=w_pad,
                                          rect=rect)
+        if kwargs is None:
+            return
 
         self.subplots_adjust(**kwargs)
 
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
@@ -264,3 +264,11 @@ def _subplots():
                 child.set_visible(False)
 
     plt.tight_layout()
+
+def test_empty_layout():
+    """Tests that tight layout doesn't cause an error when there are
+    no axes.
+    """
+
+    fig = plt.gcf()
+    fig.tight_layout()
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -319,6 +319,9 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
 
         subplots.append(ax)
 
+    if (len(nrows_list) == 0) or (len(ncols_list) == 0):
+        return
+
     max_nrows = max(nrows_list)
     max_ncols = max(ncols_list)
 
