Modernize a bit floating_axes tests.

Subplot has been subsumed into Axes; use add_subplot(axes_class=...)
instead of manually adding axes to figures; inline some variables; rely
on the ability to index multiple axises at once.

Author: anntzer

lib/mpl_toolkits/axisartist/tests/test_floating_axes.py

@@ -6,8 +6,7 @@
 from matplotlib.testing.decorators import image_comparison
 from mpl_toolkits.axisartist.axislines import Subplot
 from mpl_toolkits.axisartist.floating_axes import (
-    FloatingSubplot,
-    GridHelperCurveLinear)
+    FloatingAxes, GridHelperCurveLinear)
 from mpl_toolkits.axisartist.grid_finder import FixedLocator
 from mpl_toolkits.axisartist import angle_helper
 
@@ -26,37 +25,27 @@ def test_curvelinear3():
 
     tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) +
           mprojections.PolarAxes.PolarTransform())
-
-    grid_locator1 = angle_helper.LocatorDMS(15)
-    tick_formatter1 = angle_helper.FormatterDMS()
-
-    grid_locator2 = FixedLocator([2, 4, 6, 8, 10])
-
-    grid_helper = GridHelperCurveLinear(tr,
-                                        extremes=(0, 360, 10, 3),
-                                        grid_locator1=grid_locator1,
-                                        grid_locator2=grid_locator2,
-                                        tick_formatter1=tick_formatter1,
-                                        tick_formatter2=None)
-
-    ax1 = FloatingSubplot(fig, 111, grid_helper=grid_helper)
-    fig.add_subplot(ax1)
+    grid_helper = GridHelperCurveLinear(
+        tr,
+        extremes=(0, 360, 10, 3),
+        grid_locator1=angle_helper.LocatorDMS(15),
+        grid_locator2=FixedLocator([2, 4, 6, 8, 10]),
+        tick_formatter1=angle_helper.FormatterDMS(),
+        tick_formatter2=None)
+    ax1 = fig.add_subplot(axes_class=FloatingAxes, grid_helper=grid_helper)
 
     r_scale = 10
     tr2 = mtransforms.Affine2D().scale(1, 1 / r_scale) + tr
-    grid_locator2 = FixedLocator([30, 60, 90])
-    grid_helper2 = GridHelperCurveLinear(tr2,
-                                         extremes=(0, 360,
-                                                   10 * r_scale, 3 * r_scale),
-                                         grid_locator2=grid_locator2)
+    grid_helper2 = GridHelperCurveLinear(
+        tr2,
+        extremes=(0, 360, 10 * r_scale, 3 * r_scale),
+        grid_locator2=FixedLocator([30, 60, 90]))
 
     ax1.axis["right"] = axis = grid_helper2.new_fixed_axis("right", axes=ax1)
 
     ax1.axis["left"].label.set_text("Test 1")
     ax1.axis["right"].label.set_text("Test 2")
-
-    for an in ["left", "right"]:
-        ax1.axis[an].set_visible(False)
+    ax1.axis["left", "right"].set_visible(False)
 
     axis = grid_helper.new_floating_axis(1, 7, axes=ax1,
                                          axis_direction="bottom")
@@ -85,27 +74,18 @@ def test_curvelinear4():
 
     tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) +
           mprojections.PolarAxes.PolarTransform())
-
-    grid_locator1 = angle_helper.LocatorDMS(5)
-    tick_formatter1 = angle_helper.FormatterDMS()
-
-    grid_locator2 = FixedLocator([2, 4, 6, 8, 10])
-
-    grid_helper = GridHelperCurveLinear(tr,
-                                        extremes=(120, 30, 10, 0),
-                                        grid_locator1=grid_locator1,
-                                        grid_locator2=grid_locator2,
-                                        tick_formatter1=tick_formatter1,
-                                        tick_formatter2=None)
-
-    ax1 = FloatingSubplot(fig, 111, grid_helper=grid_helper)
-    fig.add_subplot(ax1)
+    grid_helper = GridHelperCurveLinear(
+        tr,
+        extremes=(120, 30, 10, 0),
+        grid_locator1=angle_helper.LocatorDMS(5),
+        grid_locator2=FixedLocator([2, 4, 6, 8, 10]),
+        tick_formatter1=angle_helper.FormatterDMS(),
+        tick_formatter2=None)
+    ax1 = fig.add_subplot(axes_class=FloatingAxes, grid_helper=grid_helper)
 
     ax1.axis["left"].label.set_text("Test 1")
     ax1.axis["right"].label.set_text("Test 2")
-
-    for an in ["top"]:
-        ax1.axis[an].set_visible(False)
+    ax1.axis["top"].set_visible(False)
 
     axis = grid_helper.new_floating_axis(1, 70, axes=ax1,
                                          axis_direction="bottom")