Fix ngrids support in axes_grid.Grid().

anntzer · anntzer · commit c5fb27574ed9 · 2024-03-24T13:34:11.000+01:00
Thiis also restores axes_row and axes_column to their behavior prior to 88e0d84 (which is the commit that broke ngrids support).
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -144,9 +144,9 @@ def __init__(self, fig,
             axes_array[row, col] = axes_class(
                 fig, rect, sharex=sharex, sharey=sharey)
         self.axes_all = axes_array.ravel(
-            order="C" if self._direction == "row" else "F").tolist()
-        self.axes_column = axes_array.T.tolist()
-        self.axes_row = axes_array.tolist()
+            order="C" if self._direction == "row" else "F").tolist()[:ngrids]
+        self.axes_row = [[ax for ax in row if ax] for row in axes_array]
+        self.axes_column = [[ax for ax in col if ax] for col in axes_array.T]
         self.axes_llc = self.axes_column[0][-1]
 
         self._init_locators()
@@ -256,7 +256,10 @@ def set_label_mode(self, mode):
             return
         for i in range(self._nrows):
             for j in range(self._ncols):
-                ax = self.axes_row[i][j]
+                try:
+                    ax = self.axes_row[i][j]
+                except IndexError:
+                    continue
                 if isinstance(ax.axis, MethodType):
                     bottom_axis = SimpleAxisArtist(ax.xaxis, 1, ax.spines["bottom"])
                     left_axis = SimpleAxisArtist(ax.yaxis, 1, ax.spines["left"])
diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py
@@ -792,3 +792,9 @@ def test_anchored_locator_base_call():
 def test_grid_with_axes_class_not_overriding_axis():
     Grid(plt.figure(), 111, (2, 2), axes_class=mpl.axes.Axes)
     RGBAxes(plt.figure(), 111, axes_class=mpl.axes.Axes)
+
+
+def test_grid_ngrids():
+    fig = plt.figure()
+    grid = Grid(fig, 111, (3, 3), ngrids=5)
+    assert len(fig.axes) == grid.ngrids == 5
