TST: fix log tests

jklymak · jklymak · commit 9ca82e1c3f57 · 2018-09-14T12:09:20.000-07:00
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -1201,11 +1201,20 @@ def _autolev(self, N):
             pass
 
         # Trim excess levels the locator may have supplied.
-        rtol = (self.zmin - self.zmax) * 1e-10
-        under = np.nonzero(lev < self.zmin - rtol)[0]
+
+        levt = lev
+        zmin = self.zmin
+        zmax = self.zmax
+        # tolerances need to be in log space if we are a logscale....
+        if self.logscale:
+            levt = np.log10(levt)
+            zmin = np.log10(zmin)
+            zmax = np.log10(zmax)
+        rtol = (zmin - zmax) * 1e-10
+        under = np.nonzero(levt < zmin - rtol)[0]
         i0 = under[-1] if len(under) else 0
-        over = np.nonzero(lev > self.zmax + rtol)[0]
-        i1 = over[0] + 1 if len(over) else len(lev)
+        over = np.nonzero(levt > zmax + rtol)[0]
+        i1 = over[0] + 1 if len(over) else len(levt)
         # put back extra levels if we want to extend...
         if self.extend in ('min', 'both'):
             i0 += 1
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -310,7 +310,7 @@ def test_contourf_decreasing_levels():
 def test_contourf_symmetric_locator():
     # github issue 7271
     z = np.arange(12).reshape((3, 4))
-    locator = plt.MaxNLocator(nbins=4, symmetric=True)
+    locator = plt.MaxNLocator(nbins=4, symmetric=True, trim_outside=False)
     cs = plt.contourf(z, locator=locator)
     assert_array_almost_equal(cs.levels, np.linspace(-12, 12, 5))
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -198,7 +198,6 @@ def _keep_in_vlim(locs, vmin, vmax, rtol=1e-10):
         vmax, vmin = vmin, vmax
 
     rtol = (vmax - vmin) * rtol
-    print(vmin, rtol)
     locs = locs[locs >= vmin - rtol]
     locs = locs[locs <= vmax + rtol]
     return locs
