Merge pull request #20193 from anntzer/pa

jklymak · web-flow · commit 22b5721f0380 · 2021-05-20T16:48:45.000-07:00
Simplify HostAxes.draw and its interaction with ParasiteAxes.
diff --git a/doc/api/next_api_changes/deprecations/20193-AL.rst b/doc/api/next_api_changes/deprecations/20193-AL.rst
@@ -0,0 +1,3 @@
+``ParasiteAxesBase.get_images_artists``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... has been deprecated.
diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py
@@ -24,6 +24,7 @@ def cla(self):
         martist.setp(self.get_children(), visible=False)
         self._get_lines = self._parent_axes._get_lines
 
+    @_api.deprecated("3.5")
     def get_images_artists(self):
         artists = []
         images = []
@@ -197,27 +198,20 @@ def _get_legend_handles(self, legend_handler_map=None):
         return all_handles
 
     def draw(self, renderer):
-
         orig_children_len = len(self._children)
 
-        if hasattr(self, "get_axes_locator"):
-            locator = self.get_axes_locator()
-            if locator:
-                pos = locator(self, renderer)
-                self.set_position(pos, which="active")
-                self.apply_aspect(pos)
-            else:
-                self.apply_aspect()
+        locator = self.get_axes_locator()
+        if locator:
+            pos = locator(self, renderer)
+            self.set_position(pos, which="active")
+            self.apply_aspect(pos)
         else:
             self.apply_aspect()
 
         rect = self.get_position()
-
         for ax in self.parasites:
             ax.apply_aspect(rect)
-            images, artists = ax.get_images_artists()
-            self._children.extend(images)
-            self._children.extend(artists)
+            self._children.extend(ax.get_children())
 
         super().draw(renderer)
         self._children = self._children[:orig_children_len]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+``ParasiteAxesBase.get_images_artists``
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+... has been deprecated.`