Deprecate any LocatableAxes in toolkits.

QuLogic · QuLogic · commit b9876aeabca0 · 2018-02-09T00:50:29.000-05:00
It's now no longer used for anything, since maxes.Axes is locatable
already.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -920,6 +920,17 @@ def make_axes_area_auto_adjustable(ax,
     divider.add_auto_adjustable_area(use_axes=use_axes, pad=pad,
                                      adjust_dirs=adjust_dirs)
 
-#from matplotlib.axes import Axes
-from .mpl_axes import Axes
-LocatableAxes = Axes
+
+from .mpl_axes import Axes as _Axes
+
+
+@cbook.deprecated('2.2',
+                  alternative='mpl_toolkits.axes_grid1.mpl_axes.Axes')
+class Axes(_Axes):
+    pass
+
+
+@cbook.deprecated('2.2',
+                  alternative='mpl_toolkits.axes_grid1.mpl_axes.Axes')
+class LocatableAxes(_Axes):
+    pass
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -8,8 +8,9 @@
 import matplotlib.ticker as ticker
 from matplotlib.gridspec import SubplotSpec
 
-from .axes_divider import Size, SubplotDivider, LocatableAxes, Divider
+from .axes_divider import Size, SubplotDivider, Divider
 from .colorbar import Colorbar
+from .mpl_axes import Axes
 
 
 def _extend_axes_pad(value):
@@ -106,7 +107,7 @@ def toggle_label(self, b):
         #axis.label.set_visible(b)
 
 
-class CbarAxes(CbarAxesBase, LocatableAxes):
+class CbarAxes(CbarAxesBase, Axes):
     def __init__(self, *kl, **kwargs):
         orientation = kwargs.pop("orientation", None)
         if orientation is None:
@@ -115,10 +116,10 @@ def __init__(self, *kl, **kwargs):
         self._default_label_on = True
         self.locator = None
 
-        super(LocatableAxes, self).__init__(*kl, **kwargs)
+        super(Axes, self).__init__(*kl, **kwargs)
 
     def cla(self):
-        LocatableAxes.cla(self)
+        Axes.cla(self)
         self._config_axes()
 
 
@@ -132,7 +133,7 @@ class Grid(object):
     be easily done in matplotlib. AxesGrid is used in such case.
     """
 
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
 
     def __init__(self, fig,
                  rect,
@@ -192,12 +193,12 @@ def __init__(self, fig,
         self._direction = direction
 
         if axes_class is None:
-            axes_class = self._defaultLocatableAxesClass
+            axes_class = self._defaultAxesClass
             axes_class_args = {}
         else:
             if (type(axes_class)) == type and \
                    issubclass(axes_class,
-                              self._defaultLocatableAxesClass.Axes):
+                              self._defaultAxesClass.Axes):
                 axes_class_args = {}
             else:
                 axes_class, axes_class_args = axes_class
@@ -513,7 +514,7 @@ def __init__(self, fig,
         self._direction = direction
 
         if axes_class is None:
-            axes_class = self._defaultLocatableAxesClass
+            axes_class = self._defaultAxesClass
             axes_class_args = {}
         else:
             if isinstance(axes_class, maxes.Axes):
diff --git a/lib/mpl_toolkits/axisartist/axes_divider.py b/lib/mpl_toolkits/axisartist/axes_divider.py
@@ -1,9 +1,22 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
+from matplotlib import cbook
+
 from mpl_toolkits.axes_grid1.axes_divider import (
     Divider, AxesLocator, SubplotDivider, AxesDivider, locatable_axes_factory,
     make_axes_locatable)
 
-from mpl_toolkits.axisartist.axislines import Axes
-LocatableAxes = Axes
+from mpl_toolkits.axisartist.axislines import Axes as _Axes
+
+
+@cbook.deprecated('2.2',
+                  alternative='mpl_toolkits.axisartist.axislines.Axes')
+class Axes(_Axes):
+    pass
+
+
+@cbook.deprecated('2.2',
+                  alternative='mpl_toolkits.axisartist.axislines.Axes')
+class LocatableAxes(_Axes):
+    pass
diff --git a/lib/mpl_toolkits/axisartist/axes_grid.py b/lib/mpl_toolkits/axisartist/axes_grid.py
@@ -2,9 +2,10 @@
                         unicode_literals)
 
 import mpl_toolkits.axes_grid1.axes_grid as axes_grid_orig
-from .axes_divider import LocatableAxes
+from .axislines import Axes
 
-class CbarAxes(axes_grid_orig.CbarAxesBase, LocatableAxes):
+
+class CbarAxes(axes_grid_orig.CbarAxesBase, Axes):
     def __init__(self, *kl, **kwargs):
         orientation=kwargs.pop("orientation", None)
         if orientation is None:
@@ -13,18 +14,19 @@ def __init__(self, *kl, **kwargs):
         self._default_label_on = False
         self.locator = None
 
-        super(LocatableAxes, self).__init__(*kl, **kwargs)
+        super(Axes, self).__init__(*kl, **kwargs)
 
     def cla(self):
-        super(LocatableAxes, self).cla()
+        super(Axes, self).cla()
         self._config_axes()
 
 
 class Grid(axes_grid_orig.Grid):
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
+
 
 class ImageGrid(axes_grid_orig.ImageGrid):
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
     _defaultCbarAxesClass = CbarAxes
 
 AxesGrid = ImageGrid
