Merge pull request #19035 from anntzer/ghc

timhoffm · web-flow · commit 62cdc936de32 · 2020-11-28T11:39:44.000+01:00
grid_helper_curvelinear cleanups.
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -121,12 +121,12 @@ def update_lim(self, axes):
             grid_finder.grid_locator2(lat_min, lat_max)
 
         if self.nth_coord == 0:
-            xx0 = np.full(self._line_num_points, self.value, type(self.value))
+            xx0 = np.full(self._line_num_points, self.value)
             yy0 = np.linspace(lat_min, lat_max, self._line_num_points)
             xx, yy = grid_finder.transform_xy(xx0, yy0)
         elif self.nth_coord == 1:
             xx0 = np.linspace(lon_min, lon_max, self._line_num_points)
-            yy0 = np.full(self._line_num_points, self.value, type(self.value))
+            yy0 = np.full(self._line_num_points, self.value)
             xx, yy = grid_finder.transform_xy(xx0, yy0)
 
         self.grid_info = {
@@ -190,14 +190,7 @@ def get_tick_iterators(self, axes):
         xx0 = lon_levs / lon_factor
         dx = 0.01 / lon_factor
 
-        if None in self._extremes:
-            e0, e1 = self._extremes
-        else:
-            e0, e1 = sorted(self._extremes)
-        if e0 is None:
-            e0 = -np.inf
-        if e1 is None:
-            e1 = np.inf
+        e0, e1 = self._extremes
 
         if self.nth_coord == 0:
             mask = (e0 <= yy0) & (yy0 <= e1)
diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -123,11 +123,11 @@ def test_polar_box():
     ax1.axis["lat"] = axis = grid_helper.new_floating_axis(0, 45, axes=ax1)
     axis.label.set_text("Test")
     axis.label.set_visible(True)
-    axis.get_helper()._extremes = 2, 12
+    axis.get_helper().set_extremes(2, 12)
 
     ax1.axis["lon"] = axis = grid_helper.new_floating_axis(1, 6, axes=ax1)
     axis.label.set_text("Test 2")
-    axis.get_helper()._extremes = -180, 90
+    axis.get_helper().set_extremes(-180, 90)
 
     # A parasite axes with given transform
     ax2 = ParasiteAxes(ax1, tr, viewlim_mode="equal")
@@ -186,20 +186,20 @@ def test_axis_direction():
         axes=ax1, axis_direction="left")
     axis.label.set_text("Test")
     axis.label.set_visible(True)
-    axis.get_helper()._extremes = 0.001, 10
+    axis.get_helper().set_extremes(0.001, 10)
 
     ax1.axis["lat2"] = axis = grid_helper.new_floating_axis(
         0, 50,
         axes=ax1, axis_direction="right")
     axis.label.set_text("Test")
     axis.label.set_visible(True)
-    axis.get_helper()._extremes = 0.001, 10
+    axis.get_helper().set_extremes(0.001, 10)
 
     ax1.axis["lon"] = axis = grid_helper.new_floating_axis(
         1, 10,
         axes=ax1, axis_direction="bottom")
     axis.label.set_text("Test 2")
-    axis.get_helper()._extremes = 50, 130
+    axis.get_helper().set_extremes(50, 130)
     axis.major_ticklabels.set_axis_direction("top")
     axis.label.set_axis_direction("top")
 
