FIX: make local axes a stack

jklymak · jklymak · commit f49e48f2a6b8 · 2020-09-16T16:12:19.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -250,7 +250,7 @@ def __init__(self):
         self.figure = self
         # list of child gridspecs for this figure
         self._gridspecs = []
-        self._localaxes = []  # keep track of axes at this level
+        self._localaxes = _AxesStack() # keep track of axes at this level
         self.artists = []
         self.lines = []
         self.patches = []
@@ -276,7 +276,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:
+        for ax in self._localaxes.as_list():
             locator = ax.get_axes_locator()
             if locator:
                 pos = locator(ax, renderer)
@@ -345,7 +345,7 @@ def get_children(self):
         """Get a list of artists contained in the figure."""
         return [self.patch,
                 *self.artists,
-                *self._localaxes,
+                *self._localaxes.as_list(),
                 *self.lines,
                 *self.patches,
                 *self.texts,
@@ -836,7 +836,7 @@ def add_subplot(self, *args, **kwargs):
     def _add_axes_internal(self, key, ax):
         """Private helper for `add_axes` and `add_subplot`."""
         self._axstack.add(key, ax)
-        self._localaxes += [ax]
+        self._localaxes.add(key, ax)
         self.sca(ax)
         ax._remove_method = self.delaxes
         self.stale = True
@@ -2020,7 +2020,7 @@ def get_axes(self):
         Return a list of axes in the SubPanel. You can access and modify the
         axes in the Figure through this list.
         """
-        return self._localaxes
+        return self._localaxes.as_list()
 
     axes = property(get_axes, doc="""
         List of axes in the Figure.  You can access and modify the axes
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -135,7 +135,7 @@ def __init__(
         # Calculate the pseudo-data width and height
         pseudo_bbox = self.transLimits.inverted().transform([(0, 0), (1, 1)])
         self._pseudo_w, self._pseudo_h = pseudo_bbox[1] - pseudo_bbox[0]
-
+        
         # mplot3d currently manages its own spines and needs these turned off
         # for bounding box calculations
         for k in self.spines.keys():
