Merge pull request #12866 from anntzer/logstride

jklymak · web-flow · commit d4b42b68f2c6 · 2018-11-23T12:19:34.000-08:00
Simplify stride calculations in loglocator.
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -2185,15 +2185,10 @@ def tick_values(self, vmin, vmax):
         else:
             subs = self._subs
 
-        # get decades between major ticks.
-        stride = 1
-        if rcParams['_internal.classic_mode']:
-            # Leave the bug left over from the PY2-PY3 transition.
-            while numdec / stride + 1 > numticks:
-                stride += 1
-        else:
-            while numdec // stride + 1 > numticks:
-                stride += 1
+        # Get decades between major ticks.
+        stride = (max(math.ceil(numdec / (numticks - 1)), 1)
+                  if rcParams['_internal.classic_mode'] else
+                  (numdec + 1) // numticks + 1)
 
         # Does subs include anything other than 1?
         have_subs = len(subs) > 1 or (len(subs) == 1 and subs[0] != 1.0)
