Fixed bug in if condition bivariate mapping

patniharshit · patniharshit · commit 85df736206c6 · 2017-08-27T15:00:04.000+05:30
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5165,8 +5165,9 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
         self.set_aspect(aspect)
 
         temp = np.asarray(X)
-        if (temp.ndim == 3 and isinstance(norm, mcolors.BivariateNorm) or
-                isinstance(cmap, mcolors.BivariateColormap)):
+        isBivari = (isinstance(norm, mcolors.BivariateNorm) or
+                    isinstance(cmap, mcolors.BivariateColormap))
+        if (temp.ndim == 3 and isBivari):
             if cmap is None:
                 cmap = mcolors.BivariateColormap()
             if norm is None:
@@ -5222,8 +5223,9 @@ def _pcolorargs(funcname, *args, **kw):
         if len(args) == 1:
             C = np.asanyarray(args[0])
 
-            if (C.ndim == 3 and isinstance(norm, mcolors.BivariateNorm) or
-                    isinstance(cmap, 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()
                 if norm is None:
@@ -5246,8 +5248,9 @@ def _pcolorargs(funcname, *args, **kw):
 
         if len(args) == 3:
             X, Y, C = [np.asanyarray(a) for a in args]
-            if (C.ndim == 3 and isinstance(norm, mcolors.BivariateNorm) or
-                    isinstance(cmap, 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()
                 if norm is None:
@@ -5803,8 +5806,9 @@ def pcolorfast(self, *args, **kwargs):
 
         C = np.asarray(args[-1])
 
-        if (C.ndim == 3 and isinstance(norm, mcolors.BivariateNorm) or
-                isinstance(cmap, 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()
             if norm is None:
