Deprecate any LocatableAxes in toolkits.

It's now no longer used for anything, since maxes.Axes is locatable
already.

Author: QuLogic

lib/mpl_toolkits/axes_grid1/axes_divider.py

@@ -901,6 +901,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('3.0',
+                  alternative='mpl_toolkits.axes_grid1.mpl_axes.Axes')
+class Axes(_Axes):
+    pass
+
+
+@cbook.deprecated('3.0',
+                  alternative='mpl_toolkits.axes_grid1.mpl_axes.Axes')
+class LocatableAxes(_Axes):
+    pass

lib/mpl_toolkits/axes_grid1/axes_grid.py

@@ -4,8 +4,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):
@@ -100,7 +101,7 @@ def toggle_label(self, b):
         #axis.label.set_visible(b)
 
 
-class CbarAxes(CbarAxesBase, LocatableAxes):
+class CbarAxes(CbarAxesBase, Axes):
     def __init__(self, *args, orientation, **kwargs):
         self.orientation = orientation
         self._default_label_on = True
@@ -122,7 +123,7 @@ class Grid(object):
     be easily done in matplotlib. AxesGrid is used in such case.
     """
 
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
 
     def __init__(self, fig,
                  rect,
@@ -182,12 +183,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 (isinstance(axes_class, type)
                     and issubclass(axes_class,
-                                   self._defaultLocatableAxesClass.Axes)):
+                                   self._defaultAxesClass.Axes)):
                 axes_class_args = {}
             else:
                 axes_class, axes_class_args = axes_class
@@ -503,7 +504,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):

lib/mpl_toolkits/axisartist/axes_divider.py

@@ -1,6 +1,19 @@
+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('3.0',
+                  alternative='mpl_toolkits.axisartist.axislines.Axes')
+class Axes(_Axes):
+    pass
+
+
+@cbook.deprecated('3.0',
+                  alternative='mpl_toolkits.axisartist.axislines.Axes')
+class LocatableAxes(_Axes):
+    pass

lib/mpl_toolkits/axisartist/axes_grid.py

@@ -1,8 +1,8 @@
 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, *args, orientation, **kwargs):
         self.orientation = orientation
         self._default_label_on = False
@@ -15,11 +15,11 @@ def cla(self):
 
 
 class Grid(axes_grid_orig.Grid):
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
 
 
 class ImageGrid(axes_grid_orig.ImageGrid):
-    _defaultLocatableAxesClass = LocatableAxes
+    _defaultAxesClass = Axes
     _defaultCbarAxesClass = CbarAxes