Turn _localaxes into a plain list.

gca() order is only tracked by the toplevel axstack; _localaxes can be a
plain list, just tracking the order in which axes were added to the
figure.

Author: anntzer

lib/matplotlib/_constrained_layout.py

@@ -167,7 +167,7 @@ def make_layoutgrids(fig, layoutgrids):
         layoutgrids = make_layoutgrids(sfig, layoutgrids)
 
     # for each axes at the local level add its gridspec:
-    for ax in fig._localaxes.as_list():
+    for ax in fig._localaxes:
         if hasattr(ax, 'get_subplotspec'):
             gs = ax.get_subplotspec().get_gridspec()
             layoutgrids = make_layoutgrids_gs(layoutgrids, gs)
@@ -298,7 +298,7 @@ def make_layout_margins(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0,
                                           hspace=hspace, wspace=wspace)
         layoutgrids[sfig].parent.edit_outer_margin_mins(margins, ss)
 
-    for ax in fig._localaxes.as_list():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 
@@ -561,7 +561,7 @@ def reposition_axes(layoutgrids, fig, renderer, *,
                         w_pad=w_pad, h_pad=h_pad,
                         wspace=wspace, hspace=hspace)
 
-    for ax in fig._localaxes.as_list():
+    for ax in fig._localaxes:
         if not hasattr(ax, 'get_subplotspec') or not ax.get_in_layout():
             continue
 

lib/matplotlib/figure.py

@@ -203,7 +203,7 @@ def __init__(self, **kwargs):
         self.figure = self
         # list of child gridspecs for this figure
         self._gridspecs = []
-        self._localaxes = _AxesStack()  # track all axes and current axes
+        self._localaxes = []  # track all axes
         self.artists = []
         self.lines = []
         self.patches = []
@@ -229,7 +229,7 @@ def _get_draw_artists(self, renderer):
         artists = sorted(
             (artist for artist in artists if not artist.get_animated()),
             key=lambda artist: artist.get_zorder())
-        for ax in self._localaxes.as_list():
+        for ax in self._localaxes:
             locator = ax.get_axes_locator()
             if locator:
                 pos = locator(ax, renderer)
@@ -294,7 +294,7 @@ def get_children(self):
         """Get a list of artists contained in the figure."""
         return [self.patch,
                 *self.artists,
-                *self._localaxes.as_list(),
+                *self._localaxes,
                 *self.lines,
                 *self.patches,
                 *self.texts,
@@ -776,7 +776,8 @@ def add_subplot(self, *args, **kwargs):
     def _add_axes_internal(self, ax, key):
         """Private helper for `add_axes` and `add_subplot`."""
         self._axstack.add(ax)
-        self._localaxes.add(ax)
+        if ax not in self._localaxes:
+            self._localaxes.append(ax)
         self.sca(ax)
         ax._remove_method = self.delaxes
         # this is to support plt.subplot's re-selection logic
@@ -2081,14 +2082,14 @@ def axes(self):
         List of Axes in the SubFigure.  You can access and modify the Axes
         in the SubFigure through this list.
 
-        Do not modify the list itself. Instead, use `~.SubFigure.add_axes`,
+        Modifying this list has no effect. Instead, use `~.SubFigure.add_axes`,
         `~.SubFigure.add_subplot` or `~.SubFigure.delaxes` to add or remove an
         Axes.
 
         Note: The `.SubFigure.axes` property and `~.SubFigure.get_axes` method
         are equivalent.
         """
-        return self._localaxes.as_list()
+        return self._localaxes[:]
 
     get_axes = axes.fget