Revert isBivari, remove classic locator

patniharshit · patniharshit · commit 50010e746ce4 · 2017-07-30T00:06:45.000+05:30
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5182,8 +5182,8 @@ def _pcolorargs(funcname, *args, **kw):
 
         if len(args) == 1:
             C = np.asanyarray(args[0])
-            isBivari = isinstance(norm, (mcolors.BivariateNorm,
-                                    mcolors.BivariateColormap))
+            isBivari = (isinstance(norm, mcolors.BivariateNorm)
+                        or isinstance(cmap, mcolors.BivariateColormap))
             if (C.ndim == 3 and isBivari):
                 if cmap is None:
                     cmap = mcolors.BivariateColormap()
@@ -5201,8 +5201,8 @@ def _pcolorargs(funcname, *args, **kw):
 
         if len(args) == 3:
             X, Y, C = [np.asanyarray(a) for a in args]
-            isBivari = isinstance(norm, (mcolors.BivariateNorm,
-                                    mcolors.BivariateColormap))
+            isBivari = (isinstance(norm, mcolors.BivariateNorm)
+                        or isinstance(cmap, mcolors.BivariateColormap))
             if (C.ndim == 3 and isBivari):
                 if cmap is None:
                     cmap = mcolors.BivariateColormap()
@@ -5757,8 +5757,8 @@ def pcolorfast(self, *args, **kwargs):
 
         C = np.asarray(args[-1])
 
-        isBivari = isinstance(norm, (mcolors.BivariateNorm,
-                                mcolors.BivariateColormap))
+        isBivari = (isinstance(norm, mcolors.BivariateNorm)
+                    or isinstance(cmap, mcolors.BivariateColormap))
         if (C.ndim == 3 and isBivari):
             C = norm(C)
             nr, nc = C.shape
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -1158,9 +1158,6 @@ def _ticker(self, norm):
                                       linthresh=norm.linthresh,
                                       base=10)
                 else:
-                    if mpl.rcParams['_internal.classic_mode']:
-                        locator = ticker.MaxNLocator()
-                    else:
                         # locator = ticker.AutoLocator()
                         locator = ticker.MaxNLocator(nbins=5)
             else:
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -865,7 +865,8 @@ def _init(self):
         red_mesh, green_mesh = np.meshgrid(red, green)
         blue_mesh = np.zeros_like(red_mesh)
         alpha_mesh = np.ones_like(red_mesh)
-        bivariate_cmap = np.dstack((red_mesh, green_mesh, blue_mesh, alpha_mesh))
+        bivariate_cmap = np.dstack((red_mesh, green_mesh, blue_mesh,
+                                    alpha_mesh))
         self._lut = np.vstack(bivariate_cmap)
         self._isinit = True
         self.N = self.N * self.N
