Style/typo fixes.

anntzer · anntzer · commit c773d8005794 · 2017-04-15T15:58:50.000-07:00
diff --git a/doc/api/api_changes/2017-01-30-AL_is_numlike_stringlike.rst b/doc/api/api_changes/2017-01-30-AL_is_numlike_stringlike.rst
@@ -2,9 +2,9 @@
 ````````````````````````````````````````````````````````````````````````````````````````
 
 `cbook.is_numlike` now only checks that its argument is an instance of
-``(numbers.Number, np.Number)`` and.  In particular, this means that arrays are
-now not num-like.
+``(numbers.Number, np.Number)``.  In particular, this means that arrays are now
+not num-like.
 
 `cbook.is_string_like` and `cbook.is_sequence_of_strings` have been
-deprecated.  Use ``isinstance(obj, six.string_types)`` and ``all(isinstance(o,
-six.string_types) for o in obj) and not iterable(obj)`` instead.
+deprecated.  Use ``isinstance(obj, six.string_types)`` and ``iterable(obj) and
+all(isinstance(o, six.string_types) for o in obj)`` instead.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1281,7 +1281,8 @@ def set_aspect(self, aspect, adjustable=None, anchor=None):
           etc.
           =====   =====================
         """
-        if isinstance(aspect, six.string_types) and aspect in ('equal', 'auto'):
+        if (isinstance(aspect, six.string_types)
+                and aspect in ('equal', 'auto')):
             self._aspect = aspect
         else:
             self._aspect = float(aspect)  # raise ValueError if necessary
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1221,7 +1221,8 @@ def finddir(o, match, case=False):
     is True require an exact case match.
     """
     if case:
-        names = [(name, name) for name in dir(o) if isinstance(name, six.string_types)]
+        names = [(name, name) for name in dir(o)
+                 if isinstance(name, six.string_types)]
     else:
         names = [(name.lower(), name) for name in dir(o)
                  if isinstance(name, six.string_types)]
@@ -1598,7 +1599,7 @@ def delete_masked_points(*args):
     margs = []
     seqlist = [False] * len(args)
     for i, x in enumerate(args):
-        if ((not isinstance(x, six.string_types)) and iterable(x)
+        if (not isinstance(x, six.string_types) and iterable(x)
                 and len(x) == nrecs):
             seqlist[i] = True
             if isinstance(x, np.ma.MaskedArray):
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -789,8 +789,7 @@ def __init__(self, colors, name='from_list', N=None):
         if N is None:
             N = len(self.colors)
         else:
-            if (isinstance(self.colors, six.string_types) and
-                    cbook.is_hashable(self.colors)):
+            if isinstance(self.colors, six.string_types):
                 self.colors = [self.colors] * N
                 self.monochrome = True
             elif cbook.iterable(self.colors):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1289,7 +1289,8 @@ def update_from(self, other):
 
     def _get_rgba_face(self, alt=False):
         facecolor = self._get_markerfacecolor(alt=alt)
-        if isinstance(facecolor, six.string_types) and facecolor.lower() == 'none':
+        if (isinstance(facecolor, six.string_types)
+                and facecolor.lower() == 'none'):
             rgbaFace = None
         else:
             rgbaFace = mcolors.to_rgba(facecolor, self._alpha)
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -506,7 +506,8 @@ def set_bbox(self, rectprops):
                     pad = 0.3
 
             # boxstyle could be a callable or a string
-            if isinstance(boxstyle, six.string_types) and "pad" not in boxstyle:
+            if (isinstance(boxstyle, six.string_types)
+                    and "pad" not in boxstyle):
                 boxstyle += ",pad=%0.2f" % pad
 
             bbox_transmuter = props.pop("bbox_transmuter", None)
@@ -1865,8 +1866,10 @@ def _get_ref_xy(self, renderer):
 
         if isinstance(self.xycoords, tuple):
             s1, s2 = self.xycoords
-            if ((isinstance(s1, six.string_types) and s1.split()[0] == "offset") or
-                  (isinstance(s2, six.string_types) and s2.split()[0] == "offset")):
+            if ((isinstance(s1, six.string_types)
+                 and s1.split()[0] == "offset")
+                    or (isinstance(s2, six.string_types)
+                        and s2.split()[0] == "offset")):
                 raise ValueError("xycoords should not be an offset coordinate")
             x, y = self.xy
             x1, y1 = self._get_xy(renderer, x, y, s1)
