TST

jklymak · jklymak · commit 8682346fa20f · 2020-12-08T11:55:46.000-08:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3511,7 +3511,7 @@ def set_xscale(self, value, **kwargs):
         Parameters
         ----------
         value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
-            The axis scale type to apply.  
+            The axis scale type to apply.
 
         **kwargs
             Different keyword arguments are accepted, depending on the scale.
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -593,9 +593,11 @@ def _use_auto_colorbar_locator(self):
         Return if we should use an adjustable tick locator or a fixed
         one.  (check is used twice so factored out here...)
         """
-        contouring = self.boundaries is not None and self.spacing == 'uniform'
-        return (type(self.norm) in [colors.Normalize, colors.LogNorm] and
-                not contouring)
+        if isinstance(self.norm, colors.BoundaryNorm):
+            return False
+        if (self.boundaries is not None and self.spacing == 'uniform'):
+            return False
+        return True
 
     def _reset_locator_formatter_scale(self):
         """
@@ -626,7 +628,6 @@ def update_ticks(self):
         ax = self.ax
         # Get the locator and formatter; defaults to self.locator if not None.
         self._get_ticker_locator_formatter()
-
         if self._use_auto_colorbar_locator():
             _log.debug('Using auto colorbar locator %r on colorbar',
                        self.locator)
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -666,7 +666,7 @@ def test_SymLogNorm_single_zero():
     norm = mcolors.SymLogNorm(1e-5, vmin=-1, vmax=1, base=np.e)
     cbar = mcolorbar.ColorbarBase(fig.add_subplot(), norm=norm)
     ticks = cbar.get_ticks()
-    assert sum(ticks == 0) == 1
+    assert np.count_nonzero(ticks == 0) <= 1
     plt.close(fig)
 
 
