Merge pull request matplotlib#24905 from anntzer/dc

Remove some long-obsolete commented code in grid_helper_curvelinear.

Author: dstansby

lib/mpl_toolkits/axisartist/axislines.py

@@ -354,37 +354,30 @@ def new_fixed_axis(self, loc,
                        offset=None,
                        axes=None,
                        ):
-
         if axes is None:
             _api.warn_external(
                 "'new_fixed_axis' explicitly requires the axes keyword.")
             axes = self.axes
-
-        _helper = AxisArtistHelperRectlinear.Fixed(axes, loc, nth_coord)
-
         if axis_direction is None:
             axis_direction = loc
-        axisline = AxisArtist(axes, _helper, offset=offset,
-                              axis_direction=axis_direction,
-                              )
 
+        helper = AxisArtistHelperRectlinear.Fixed(axes, loc, nth_coord)
+        axisline = AxisArtist(axes, helper, offset=offset,
+                              axis_direction=axis_direction)
         return axisline
 
     def new_floating_axis(self, nth_coord, value,
                           axis_direction="bottom",
                           axes=None,
                           ):
-
         if axes is None:
             _api.warn_external(
                 "'new_floating_axis' explicitly requires the axes keyword.")
             axes = self.axes
 
-        _helper = AxisArtistHelperRectlinear.Floating(
+        helper = AxisArtistHelperRectlinear.Floating(
             axes, nth_coord, value, axis_direction)
-
-        axisline = AxisArtist(axes, _helper, axis_direction=axis_direction)
-
+        axisline = AxisArtist(axes, helper, axis_direction=axis_direction)
         axisline.line.set_clip_on(True)
         axisline.line.set_clip_box(axisline.axes.bbox)
         return axisline

lib/mpl_toolkits/axisartist/floating_axes.py

@@ -167,9 +167,9 @@ def new_fixed_axis(self, loc,
             axis_direction = loc
         # This is not the same as the FixedAxisArtistHelper class used by
         # grid_helper_curvelinear.GridHelperCurveLinear.new_fixed_axis!
-        _helper = FixedAxisArtistHelper(
+        helper = FixedAxisArtistHelper(
             self, loc, nth_coord_ticks=nth_coord)
-        axisline = AxisArtist(axes, _helper, axis_direction=axis_direction)
+        axisline = AxisArtist(axes, helper, axis_direction=axis_direction)
         # Perhaps should be moved to the base class?
         axisline.line.set_clip_on(True)
         axisline.line.set_clip_box(axisline.axes.bbox)

lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py

@@ -268,8 +268,8 @@ def new_fixed_axis(self, loc,
             axes = self.axes
         if axis_direction is None:
             axis_direction = loc
-        _helper = FixedAxisArtistHelper(self, loc, nth_coord_ticks=nth_coord)
-        axisline = AxisArtist(axes, _helper, axis_direction=axis_direction)
+        helper = FixedAxisArtistHelper(self, loc, nth_coord_ticks=nth_coord)
+        axisline = AxisArtist(axes, helper, axis_direction=axis_direction)
         # Why is clip not set on axisline, unlike in new_floating_axis or in
         # the floating_axig.GridHelperCurveLinear subclass?
         return axisline
@@ -279,27 +279,15 @@ def new_floating_axis(self, nth_coord,
                           axes=None,
                           axis_direction="bottom"
                           ):
-
         if axes is None:
             axes = self.axes
-
-        _helper = FloatingAxisArtistHelper(
+        helper = FloatingAxisArtistHelper(
             self, nth_coord, value, axis_direction)
-
-        axisline = AxisArtist(axes, _helper)
-
-        # _helper = FloatingAxisArtistHelper(self, nth_coord,
-        #                                    value,
-        #                                    label_direction=label_direction,
-        #                                    )
-
-        # axisline = AxisArtistFloating(axes, _helper,
-        #                               axis_direction=axis_direction)
+        axisline = AxisArtist(axes, helper)
         axisline.line.set_clip_on(True)
         axisline.line.set_clip_box(axisline.axes.bbox)
         # axisline.major_ticklabels.set_visible(True)
         # axisline.minor_ticklabels.set_visible(False)
-
         return axisline
 
     def _update_grid(self, x1, y1, x2, y2):

lib/mpl_toolkits/axisartist/tests/test_axis_artist.py

@@ -87,8 +87,8 @@ def test_axis_artist():
     ax.yaxis.set_visible(False)
 
     for loc in ('left', 'right', 'bottom'):
-        _helper = AxisArtistHelperRectlinear.Fixed(ax, loc=loc)
-        axisline = AxisArtist(ax, _helper, offset=None, axis_direction=loc)
+        helper = AxisArtistHelperRectlinear.Fixed(ax, loc=loc)
+        axisline = AxisArtist(ax, helper, offset=None, axis_direction=loc)
         ax.add_artist(axisline)
 
     # Settings for bottom AxisArtist.