Merge pull request #22619 from meeseeksmachine/auto-backport-of-pr-22611-on-v3.5.x

timhoffm · web-flow · commit e1610c2c46f7 · 2022-03-08T03:39:55.000+01:00
Backport PR #22611 on branch v3.5.x (FIX: Colorbars check for subplotspec attribute before using)
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -280,12 +280,10 @@ def get_subplotspec(self):
         # make tight_layout happy..
         ss = getattr(self._cbar.ax, 'get_subplotspec', None)
         if ss is None:
-            if self._orig_locator is None:
+            if not hasattr(self._orig_locator, "get_subplotspec"):
                 return None
-            ss = self._orig_locator.get_subplotspec()
-        else:
-            ss = ss()
-        return ss
+            ss = self._orig_locator.get_subplotspec
+        return ss()
 
 
 class Colorbar:
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -99,6 +99,18 @@ def test_axesgrid_colorbar_log_smoketest():
     grid.cbar_axes[0].colorbar(im)
 
 
+def test_inset_colorbar_tight_layout_smoketest():
+    fig, ax = plt.subplots(1, 1)
+    pts = ax.scatter([0, 1], [0, 1], c=[1, 5])
+
+    cax = inset_axes(ax, width="3%", height="70%")
+    plt.colorbar(pts, cax=cax)
+
+    with pytest.warns(UserWarning, match="This figure includes Axes"):
+        # Will warn, but not raise an error
+        plt.tight_layout()
+
+
 @image_comparison(['inset_locator.png'], style='default', remove_text=True)
 def test_inset_locator():
     fig, ax = plt.subplots(figsize=[5, 4])
