matplotlib
diff --git a/‎lib/matplotlib/tests/test_tightlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_tightlayout.py
+38Lines changed: 38 additions & 0 deletions b/‎lib/matplotlib/tests/test_tightlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_tightlayout.py
+38Lines changed: 38 additions & 0 deletions
diff --git a/‎lib/matplotlib/tight_layout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tight_layout.py
+10-4Lines changed: 10 additions & 4 deletions b/‎lib/matplotlib/tight_layout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tight_layout.py
+10-4Lines changed: 10 additions & 4 deletions
@@ -272,3 +272,41 @@ def test_empty_layout():
 
     fig = plt.gcf()
     fig.tight_layout()
+
+
+def test_verybig_decorators_horizontal():
+    "Test that warning emitted when xlabel too big"
+    fig, ax = plt.subplots(figsize=(3, 2))
+    ax.set_xlabel('a' * 100)
+    with warnings.catch_warnings(record=True) as w:
+        fig.tight_layout()
+        assert len(w) == 1
+
+
+def test_verybig_decorators_vertical():
+    "Test that warning emitted when xlabel too big"
+    fig, ax = plt.subplots(figsize=(3, 2))
+    ax.set_ylabel('a' * 100)
+    with warnings.catch_warnings(record=True) as w:
+        fig.tight_layout()
+        assert len(w) == 1
+
+
+def test_big_decorators_horizontal():
+    "Test that warning emitted when xlabel too big"
+    fig, axs = plt.subplots(1, 2, figsize=(3, 2))
+    axs[0].set_xlabel('a' * 30)
+    axs[1].set_xlabel('b' * 30)
+    with warnings.catch_warnings(record=True) as w:
+        fig.tight_layout()
+        assert len(w) == 1
+
+
+def test_big_decorators_vertical():
+    "Test that warning emitted when xlabel too big"
+    fig, axs = plt.subplots(2, 1, figsize=(3, 2))
+    axs[0].set_ylabel('a' * 20)
+    axs[1].set_ylabel('b' * 20)
+    with warnings.catch_warnings(record=True) as w:
+        fig.tight_layout()
+        assert len(w) == 1
@@ -175,7 +175,13 @@ def auto_adjust_subplotpars(
         margin_left = 0.4999
         margin_right = 0.4999
         warnings.warn('The left and right margins cannot be made large '
-                      'enough to accomodate all axes decorations. ')
+                      'enough to accommodate all axes decorations. ')
+    if margin_bottom + margin_top >= 1:
+        margin_bottom = 0.4999
+        margin_top = 0.4999
+        warnings.warn('The bottom and top margins cannot be made large '
+                      'enough to accommodate all axes decorations. ')
+
     kwargs = dict(left=margin_left,
                   right=1 - margin_right,
                   bottom=margin_bottom,
@@ -188,9 +194,9 @@ def auto_adjust_subplotpars(
             + hpad_inches / fig_width_inch)
         # axes widths:
         h_axes = (1 - margin_right - margin_left - hspace * (cols - 1)) / cols
-        if h_axes < 0.:
+        if h_axes < 0:
             warnings.warn('tight_layout cannot make axes width small enough '
-                          'to accomodate all axes decorations')
+                          'to accommodate all axes decorations')
             kwargs["wspace"] = 0.5
         else:
             kwargs["wspace"] = hspace / h_axes
@@ -201,7 +207,7 @@ def auto_adjust_subplotpars(
         v_axes = (1 - margin_top - margin_bottom - vspace * (rows - 1)) / rows
         if v_axes < 0:
             warnings.warn('tight_layout cannot make axes height small enough '
-                          'to accomodate all axes decorations')
+                          'to accommodate all axes decorations')
             kwargs["hspace"] = 0.5
         else:
             kwargs["hspace"] = vspace / v_axes