Merge pull request #11683 from anntzer/unduplicate-axisdict

timhoffm · web-flow · commit 5d56c1c81a85 · 2019-02-10T19:22:26.000+01:00
Reuse axes_grid1's AxisDict in axisartist, instead of duplicating it.
diff --git a/doc/api/next_api_changes/2018-07-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-07-17-AL-deprecations.rst
@@ -0,0 +1,7 @@
+API deprecations
+````````````````
+
+The following API elements are deprecated:
+
+- ``mpl_toolkits.axisartist.axislines.SimpleChainedObjects``,
+  ``mpl_toolkits.Axes.AxisDict``,
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -38,15 +38,15 @@
 In addition to AxisArtist, the Axes will have *gridlines* attribute,
 which obviously draws grid lines. The gridlines needs to be separated
 from the axis as some gridlines can never pass any axis.
-
 """
+
 import numpy as np
 
-from matplotlib import cbook
-from matplotlib import rcParams
+from matplotlib import cbook, rcParams
 import matplotlib.artist as martist
 import matplotlib.axes as maxes
 from matplotlib.path import Path
+from mpl_toolkits.axes_grid1 import mpl_axes
 from .axisline_style import AxislineStyle
 from .axis_artist import AxisArtist, GridlinesCollection
 
@@ -483,6 +483,7 @@ def get_gridlines(self, which="major", axis="both"):
         return gridlines
 
 
+@cbook.deprecated("3.1")
 class SimpleChainedObjects(object):
     def __init__(self, objects):
         self._objects = objects
@@ -498,6 +499,7 @@ def __call__(self, *args, **kwargs):
 
 class Axes(maxes.Axes):
 
+    @cbook.deprecated("3.1")
     class AxisDict(dict):
         def __init__(self, axes):
             self.axes = axes
@@ -545,7 +547,7 @@ def _init_axis_artists(self, axes=None):
         if axes is None:
             axes = self
 
-        self._axislines = self.AxisDict(self)
+        self._axislines = mpl_axes.Axes.AxisDict(self)
         new_fixed_axis = self.get_grid_helper().new_fixed_axis
         for loc in ["bottom", "top", "left", "right"]:
             self._axislines[loc] = new_fixed_axis(loc=loc, axes=axes,
