MNT: remove the swap_vlim dance

tacaswell · tacaswell · commit e14ee8452de0 · 2019-09-06T16:22:40.000-04:00
In #14624 we reverted changing the order of the limits to match the input order. Doing the same here for consistency. Sort the limits before comparing. We want to make sure that it works with the values reversed, but do not expect non-singular to preserve the order.
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -387,7 +387,7 @@ def test_nonsingular_ok(self, lims):
         """
         loc = mticker.LogitLocator()
         lims2 = loc.nonsingular(*lims)
-        assert lims == lims2
+        assert sorted(lims) == sorted(lims2)
 
     @pytest.mark.parametrize("okval", acceptable_vmin_vmax)
     def test_nonsingular_nok(self, okval):
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -2794,9 +2794,7 @@ def ideal_ticks(x):
     def nonsingular(self, vmin, vmax):
         standard_minpos = 1e-7
         initial_range = (standard_minpos, 1 - standard_minpos)
-        swap_vlims = False
         if vmin > vmax:
-            swap_vlims = True
             vmin, vmax = vmax, vmin
         if not np.isfinite(vmin) or not np.isfinite(vmax):
             vmin, vmax = initial_range  # Initial range, no data plotted yet.
@@ -2826,8 +2824,7 @@ def nonsingular(self, vmin, vmax):
                 vmax = 1 - minpos
             if vmin == vmax:
                 vmin, vmax = 0.1 * vmin, 1 - 0.1 * vmin
-        if swap_vlims:
-            vmin, vmax = vmax, vmin
+
         return vmin, vmax
 
 
