Deprecate locatable_axes_factory and make it a no-op.

QuLogic · QuLogic · commit 57af90525aa4 · 2018-02-08T22:48:58.000-05:00
It's similar to LocatableAxesBase and provided in base Axes classes.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -891,31 +891,15 @@ class LocatableAxesBase(object):
     pass
 
 
-_locatableaxes_classes = {}
-
-
+@cbook.deprecated('2.2',
+                  addendum=' There is no alternative. Classes derived from '
+                           'matplotlib.axes.Axes provide this functionality '
+                           'already.')
 def locatable_axes_factory(axes_class):
-
-    new_class = _locatableaxes_classes.get(axes_class)
-    if new_class is None:
-        new_class = type(str("Locatable%s" % (axes_class.__name__)),
-                         (axes_class, ),
-                         {'_axes_class': axes_class})
-
-        _locatableaxes_classes[axes_class] = new_class
-
-    return new_class
-
-#if hasattr(maxes.Axes, "get_axes_locator"):
-#    LocatableAxes = maxes.Axes
-#else:
+    return axes_class
 
 
 def make_axes_locatable(axes):
-    if not hasattr(axes, "set_axes_locator"):
-        new_class = locatable_axes_factory(type(axes))
-        axes.__class__ = new_class
-
     divider = AxesDivider(axes)
     locator = divider.new_locator(nx=0, ny=0)
     axes.set_axes_locator(locator)
@@ -938,4 +922,4 @@ def make_axes_area_auto_adjustable(ax,
 
 #from matplotlib.axes import Axes
 from .mpl_axes import Axes
-LocatableAxes = locatable_axes_factory(Axes)
+LocatableAxes = Axes
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -118,7 +118,7 @@ def __init__(self, *kl, **kwargs):
         super(LocatableAxes, self).__init__(*kl, **kwargs)
 
     def cla(self):
-        super(LocatableAxes, self).cla()
+        LocatableAxes.cla(self)
         self._config_axes()
 
 
diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
@@ -4,7 +4,7 @@
 import six
 
 import numpy as np
-from .axes_divider import make_axes_locatable, Size, locatable_axes_factory
+from .axes_divider import make_axes_locatable, Size
 import sys
 from .mpl_axes import Axes
 
@@ -29,9 +29,9 @@ def make_rgb_axes(ax, pad=0.01, axes_class=None, add_all=True):
     ax_rgb = []
     if axes_class is None:
         try:
-            axes_class = locatable_axes_factory(ax._axes_class)
+            axes_class = ax._axes_class
         except AttributeError:
-            axes_class = locatable_axes_factory(type(ax))
+            axes_class = type(ax)
 
     for ny in [4, 2, 0]:
         ax1 = axes_class(ax.get_figure(),
diff --git a/lib/mpl_toolkits/axisartist/axes_divider.py b/lib/mpl_toolkits/axisartist/axes_divider.py
@@ -6,4 +6,4 @@
     make_axes_locatable)
 
 from mpl_toolkits.axisartist.axislines import Axes
-LocatableAxes = locatable_axes_factory(Axes)
+LocatableAxes = Axes
