Some pep8 fixes.

lkilcher · lkilcher · commit c70c1b54252c · 2016-12-31T11:37:52.000-07:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -211,8 +211,8 @@ def to_rgba_array(c, alpha=None):
     # Special-case inputs that are already arrays, for performance.  (If the
     # array has the wrong kind or shape, raise the error during one-at-a-time
     # conversion.)
-    if (isinstance(c, np.ndarray) and c.dtype.kind in "if"
-            and c.ndim == 2 and c.shape[1] in [3, 4]):
+    if (isinstance(c, np.ndarray) and c.dtype.kind in "if" and
+            c.ndim == 2 and c.shape[1] in [3, 4]):
         if c.shape[1] == 3:
             result = np.column_stack([c, np.zeros(len(c))])
             result[:, -1] = alpha if alpha is not None else 1.
@@ -778,7 +778,7 @@ def join(self, other, name=None, frac_self=None, N=None):
         if name is None:
             name = '{}+{}'.format(self.name, other.name)
         assert 0 < frac_self and frac_self < 1, (
-            "The parameter ``frac_self`` must be in the interval ``(0.0, 1.0)``."
+            "The parameter frac_self must be in the interval (0.0, 1.0)."
         )
         map0 = self(np.linspace(0, 1, int(N * frac_self)))
         map1 = other(np.linspace(0, 1, int(N * (1 - frac_self))))
@@ -819,11 +819,11 @@ def truncate(self, minval=0.0, maxval=1.0, N=None):
         cmap_trunc = cmap.truncate(0.2, 0.7)
 
         """
-        assert minval < maxval, "``minval`` must be less than ``maxval``"
+        assert minval < maxval, "minval must be less than maxval"
         assert 0 <= minval and minval < 1, (
-            "The parameter ``minval`` must be in the interval ``(0.0, 1.0)``.")
+            "The parameter minval must be in the interval (0.0, 1.0).")
         assert 0 < maxval and maxval <= 1, (
-            "The parameter ``maxval`` must be in the interval ``(0.0, 1.0)``.")
+            "The parameter maxval must be in the interval (0.0, 1.0).")
         assert minval != 0 or maxval != 1, (
             "This is not a truncation.")
         # This was taken largely from
@@ -833,7 +833,11 @@ def truncate(self, minval=0.0, maxval=1.0, N=None):
         if N is None:
             N = np.ceil(self.N * (maxval - minval))
         name = "trunc({},{:.2f},{:.2f})".format(self.name, minval, maxval)
-        return LinearSegmentedColormap.from_list(name, self(np.linspace(minval, maxval, N)), N)
+        return LinearSegmentedColormap.from_list(name,
+                                                 self(np.linspace(minval,
+                                                                  maxval,
+                                                                  N)),
+                                                 N)
 
 
 class ListedColormap(Colormap):
@@ -964,7 +968,7 @@ def join(self, other, name=None, frac_self=None, N=None):
         if name is None:
             name = '{}+{}'.format(self.name, other.name)
         assert 0 < frac_self and frac_self < 1, (
-            "The parameter ``frac_self`` must be in the interval ``(0.0, 1.0)``."
+            "The parameter frac_self must be in the interval (0.0, 1.0)."
         )
         map0 = self(np.linspace(0, 1, int(N * frac_self)))
         map1 = other(np.linspace(0, 1, int(N * (1 - frac_self))))
@@ -1005,11 +1009,11 @@ def truncate(self, minval=0.0, maxval=1.0, N=None):
         cmap_trunc = cmap.truncate(0.2, 0.7)
 
         """
-        assert minval < maxval, "``minval`` must be less than ``maxval``"
+        assert minval < maxval, "minval must be less than maxval"
         assert 0 <= minval and minval < 1, (
-            "The parameter ``minval`` must be in the interval ``(0.0, 1.0)``.")
+            "The parameter minval must be in the interval (0.0, 1.0).")
         assert 0 < maxval and maxval <= 1, (
-            "The parameter ``maxval`` must be in the interval ``(0.0, 1.0)``.")
+            "The parameter maxval must be in the interval (0.0, 1.0).")
         assert minval != 0 or maxval != 1, (
             "This is not a truncation.")
         # This was taken largely from
@@ -1244,7 +1248,7 @@ def __init__(self, linthresh, linscale=1.0,
         """
         Normalize.__init__(self, vmin, vmax, clip)
         self.linthresh = float(linthresh)
-        self._linscale_adj = (linscale / (1.0 - np.e ** -1))
+        self._linscale_adj= (linscale / (1.0 - np.e ** -1))
         if vmin is not None and vmax is not None:
             self._transform_vmin_vmax()
 
@@ -1280,7 +1284,7 @@ def _transform(self, a):
         """
         masked = np.abs(a) > self.linthresh
         sign = np.sign(a[masked])
-        log = (self._linscale_adj + np.log(np.abs(a[masked]) / self.linthresh))
+        log = (self._linscale_adj+ np.log(np.abs(a[masked]) / self.linthresh))
         log *= sign * self.linthresh
         a[masked] = log
         a[~masked] *= self._linscale_adj
