Change PEP8 violations

patniharshit · patniharshit · commit 01b593200ac7 · 2017-08-27T15:00:04.000+05:30
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5200,8 +5200,8 @@ def _pcolorargs(funcname, *args, **kw):
 
         if len(args) == 1:
             C = np.asanyarray(args[0])
-            isBivari = (isinstance(norm, mcolors.BivariateNorm) or
-                        isinstance(cmap, mcolors.BivariateColormap))
+            isBivari = isinstance(norm, (mcolors.BivariateNorm,
+                                    mcolors.BivariateColormap))
             if (C.ndim == 3 and isBivari):
                 if cmap is None:
                     cmap = mcolors.BivariateColormap()
@@ -5219,8 +5219,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) or
-                        isinstance(cmap, mcolors.BivariateColormap))
+            isBivari = isinstance(norm, (mcolors.BivariateNorm,
+                                    mcolors.BivariateColormap))
             if (C.ndim == 3 and isBivari):
                 if cmap is None:
                     cmap = mcolors.BivariateColormap()
@@ -5772,8 +5772,8 @@ def pcolorfast(self, *args, **kwargs):
 
         C = np.asarray(args[-1])
 
-        isBivari = (isinstance(norm, mcolors.BivariateNorm) or
-                    isinstance(cmap, mcolors.BivariateColormap))
+        isBivari = isinstance(norm, (mcolors.BivariateNorm,
+                                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
@@ -901,7 +901,9 @@ def remove(self):
 
 
 class ColorsquareBase(cm.ScalarMappable):
+
     n_rasterize = 50  # rasterize solids if number of colors >= n_rasterize
+
     def __init__(self, ax, cmap=None,
                  norm=None,
                  alpha=None,
@@ -1069,9 +1071,9 @@ def _set_label(self):
         self.stale = True
 
     def set_label(self, xlabel, ylabel, **kw):
-        '''
+        """
         Label the axes of the colorbar
-        '''
+        """
         self._xlabel = '%s' % (xlabel, )
         self._ylabel = '%s' % (ylabel, )
         self._labelkw = kw
@@ -1086,10 +1088,10 @@ def _edges(self, X, Y):
         + [list(zip(Y[i], X[i])) for i in xrange(1, N - 1)]
 
     def _add_solids(self, X, Y, C):
-        '''
+        """
         Draw the colors using :meth:`~matplotlib.axes.Axes.pcolormesh`;
         optionally add separators.
-        '''
+        """
         args = (X, Y, C)
         kw = dict(cmap=self.cmap,
                   norm=self.norm,
@@ -1120,10 +1122,10 @@ def _add_solids(self, X, Y, C):
             self.solids.set_rasterized(True)
 
     def _ticker(self, norm):
-        '''
+        """
         Return the sequence of ticks (colorbar data locations),
         ticklabels (strings), and the corresponding offset string.
-        '''
+        """
         if norm is self.norm.norm1:
             _values = self._xvalues
             _boundaries = self._xboundaries
@@ -1246,9 +1248,9 @@ def _process_values(self, b=None, norm=None):
         return self._process_values(b=b, norm=norm)
 
     def _mesh(self):
-        '''
+        """
         Return X,Y, the coordinate arrays for the colorbar pcolormesh.
-        '''
+        """
         x = np.linspace(0, 1, len(self._xboundaries))
         y = np.linspace(0, 1, len(self._yboundaries))
         self._x = x
@@ -1257,10 +1259,10 @@ def _mesh(self):
         return X, Y
 
     def _locate(self, x, norm):
-        '''
+        """
         Given a set of color data values, return their
         corresponding colorbar data coordinates.
-        '''
+        """
         if norm is self.norm.norm1:
             boundaries = self._xboundaries
         else:
@@ -1300,6 +1302,7 @@ def remove(self):
         fig = self.ax.figure
         fig.delaxes(self.ax)
 
+
 class Colorbar(ColorbarBase):
     """
     This class connects a :class:`ColorbarBase` to a
