Remove cross-references to axes_grid.

QuLogic · QuLogic · commit ff6139c84bbb · 2018-07-18T19:02:29.000-04:00
This is provided for backwards-compatibility, so point directly to the
implementations instead of the compatibility location.
diff --git a/.flake8 b/.flake8
@@ -61,8 +61,7 @@ per-file-ignores =
     matplotlib/type1font.py: E731
 
     mpl_toolkits/__init__.py: E261
-    mpl_toolkits/axes_grid/axes_divider.py: E501
-    mpl_toolkits/axes_grid/axes_rgb.py: E302, E501
+    mpl_toolkits/axes_grid/axes_rgb.py: E501
     mpl_toolkits/axes_grid1/axes_divider.py: E402, E501
     mpl_toolkits/axes_grid1/axes_grid.py: E225
     mpl_toolkits/axes_grid1/axes_rgb.py: E231
diff --git a/lib/mpl_toolkits/axes_grid/axes_divider.py b/lib/mpl_toolkits/axes_grid/axes_divider.py
@@ -1,5 +1,5 @@
-from mpl_toolkits.axes_grid1.axes_divider import Divider, AxesLocator, SubplotDivider, \
-     AxesDivider, locatable_axes_factory, make_axes_locatable
-
-from mpl_toolkits.axes_grid.axislines import Axes
-LocatableAxes = locatable_axes_factory(Axes)
+from mpl_toolkits.axes_grid1.axes_divider import (
+    AxesDivider, AxesLocator, Divider, SubplotDivider, locatable_axes_factory,
+    make_axes_locatable)
+from mpl_toolkits.axisartist.axes_divider import LocatableAxes
+from mpl_toolkits.axisartist.axislines import Axes
diff --git a/lib/mpl_toolkits/axes_grid/axes_grid.py b/lib/mpl_toolkits/axes_grid/axes_grid.py
@@ -1,26 +1,3 @@
-import mpl_toolkits.axes_grid1.axes_grid as axes_grid_orig
-from .axes_divider import LocatableAxes
-
-
-class CbarAxes(axes_grid_orig.CbarAxesBase, LocatableAxes):
-    def __init__(self, *args, orientation, **kwargs):
-        self.orientation = orientation
-        self._default_label_on = False
-        self.locator = None
-        super().__init__(*args, **kwargs)
-
-    def cla(self):
-        super().cla()
-        self._config_axes()
-
-
-class Grid(axes_grid_orig.Grid):
-    _defaultLocatableAxesClass = LocatableAxes
-
-
-class ImageGrid(axes_grid_orig.ImageGrid):
-    _defaultLocatableAxesClass = LocatableAxes
-    _defaultCbarAxesClass = CbarAxes
-
-
-AxesGrid = ImageGrid
+from mpl_toolkits.axisartist.axes_divider import LocatableAxes
+from mpl_toolkits.axisartist.axes_grid import (
+    AxesGrid, CbarAxes, Grid, ImageGrid)
diff --git a/lib/mpl_toolkits/axes_grid/axes_rgb.py b/lib/mpl_toolkits/axes_grid/axes_rgb.py
@@ -2,7 +2,8 @@
 from mpl_toolkits.axes_grid1.axes_rgb import make_rgb_axes, imshow_rgb, RGBAxesBase
 
 #import mpl_toolkits.axes_grid1.axes_rgb as axes_rgb_orig
-from .axislines import Axes
+from mpl_toolkits.axisartist.axislines import Axes
+
 
 class RGBAxes(RGBAxesBase):
     _defaultAxesClass = Axes
diff --git a/lib/mpl_toolkits/axes_grid/parasite_axes.py b/lib/mpl_toolkits/axes_grid/parasite_axes.py
@@ -1,8 +1,7 @@
 from mpl_toolkits.axes_grid1.parasite_axes import (
     host_axes_class_factory, parasite_axes_class_factory,
     parasite_axes_auxtrans_class_factory, subplot_class_factory)
-
-from .axislines import Axes
+from mpl_toolkits.axisartist.axislines import Axes
 
 
 ParasiteAxes = parasite_axes_class_factory(Axes)
diff --git a/lib/mpl_toolkits/axisartist/axes_divider.py b/lib/mpl_toolkits/axisartist/axes_divider.py
@@ -2,5 +2,5 @@
     Divider, AxesLocator, SubplotDivider, AxesDivider, locatable_axes_factory,
     make_axes_locatable)
 
-from mpl_toolkits.axes_grid.axislines import Axes
+from mpl_toolkits.axisartist.axislines import Axes
 LocatableAxes = locatable_axes_factory(Axes)
