Backport PR pandas-dev#52150: Fix/mpl37 compat

meeseeksmachine · Jun 25, 2023 · 2012cb0 · 2012cb0
1 parent 5299051
commit 2012cb0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/pandas/plotting/_matplotlib/core.py b/pandas/plotting/_matplotlib/core.py
@@ -1112,7 +1112,9 @@ def _get_subplots(self):
         from matplotlib.axes import Subplot
 
         return [
-            ax for ax in self.axes[0].get_figure().get_axes() if isinstance(ax, Subplot)
+            ax
+            for ax in self.fig.get_axes()
+            if (isinstance(ax, Subplot) and ax.get_subplotspec() is not None)
         ]
 
     def _get_axes_layout(self) -> tuple[int, int]:

diff --git a/pandas/tests/plotting/test_common.py b/pandas/tests/plotting/test_common.py
@@ -40,3 +40,22 @@ def test__gen_two_subplots_with_ax(self):
         subplot_geometry = list(axes[0].get_subplotspec().get_geometry()[:-1])
         subplot_geometry[-1] += 1
         assert subplot_geometry == [2, 1, 2]
+
+    def test_colorbar_layout(self):
+        fig = self.plt.figure()
+
+        axes = fig.subplot_mosaic(
+            """
+            AB
+            CC
+            """
+        )
+
+        x = [1, 2, 3]
+        y = [1, 2, 3]
+
+        cs0 = axes["A"].scatter(x, y)
+        axes["B"].scatter(x, y)
+
+        fig.colorbar(cs0, ax=[axes["A"], axes["B"]], location="right")
+        DataFrame(x).plot(ax=axes["C"])