Merge pull request #12421 from meeseeksmachine/auto-backport-of-pr-12360-on-v3.0.x

QuLogic · web-flow · commit e70895b1dc13 · 2018-10-10T23:35:39.000-04:00
Backport PR #12360 on branch v3.0.x (Replace axes_grid by axes_grid1 in test)
diff --git a/lib/mpl_toolkits/axes_grid/__init__.py b/lib/mpl_toolkits/axes_grid/__init__.py
@@ -7,6 +7,6 @@
 warn_deprecated(since='2.1',
                 name='mpl_toolkits.axes_grid',
                 alternative='mpl_toolkits.axes_grid1 and'
-                            ' mpl_toolkits.axisartist provies the same'
-                            ' functionality',
+                            ' mpl_toolkits.axisartist, which provide'
+                            ' the same functionality',
                 obj_type='module')
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -7,8 +7,8 @@
 from matplotlib.transforms import Affine2D, Transform
 from matplotlib.testing.decorators import image_comparison
 
-from mpl_toolkits.axes_grid.parasite_axes import ParasiteAxesAuxTrans, \
-    SubplotHost
+from mpl_toolkits.axes_grid1.parasite_axes import ParasiteAxesAuxTrans
+from mpl_toolkits.axisartist import SubplotHost
 from mpl_toolkits.axes_grid1.parasite_axes import host_subplot_class_factory
 from mpl_toolkits.axisartist import angle_helper
 from mpl_toolkits.axisartist.axislines import Axes
