Merge pull request #11206 from anntzer/cleanups2

jklymak · web-flow · commit c93957b52354 · 2018-05-16T10:21:48.000-07:00
More cleanups
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1650,7 +1650,7 @@ def axis(self, *v, **kwargs):
         matplotlib.axes.Axes.set_ylim
         """
 
-        if len(v) == 0 and len(kwargs) == 0:
+        if len(v) == len(kwargs) == 0:
             xmin, xmax = self.get_xlim()
             ymin, ymax = self.get_ylim()
             return xmin, xmax, ymin, ymax
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -465,7 +465,7 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,
         is not the same for every path.
         """
         Npaths = len(paths)
-        if Npaths == 0 or (len(facecolors) == 0 and len(edgecolors) == 0):
+        if Npaths == 0 or len(facecolors) == len(edgecolors) == 0:
             return 0
         Npath_ids = max(Npaths, len(all_transforms))
         N = max(Npath_ids, len(offsets))
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -71,7 +71,7 @@ def _on_timer(self):
 
         # Gtk timeout_add() requires that the callback returns True if it
         # is to be called again.
-        if len(self.callbacks) > 0 and not self._single:
+        if self.callbacks and not self._single:
             return True
         else:
             self._timer = None
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1815,7 +1815,7 @@ def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(),
                         "are in kwargs".format(keys=fail_keys))
 
     if allowed is not None:
-        allowed_set = set(required) | set(allowed)
+        allowed_set = {*required, *allowed}
         fail_keys = [k for k in ret if k not in allowed_set]
         if fail_keys:
             raise TypeError(
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -855,8 +855,7 @@ def _get_extension_lengths(self, frac, automin, automax, default=0.05):
         if isinstance(frac, str):
             if frac.lower() == 'auto':
                 # Use the provided values when 'auto' is required.
-                extendlength[0] = automin
-                extendlength[1] = automax
+                extendlength[:] = [automin, automax]
             else:
                 # Any other string is invalid.
                 raise ValueError('invalid value for extendfrac')
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -248,7 +248,7 @@ def to_rgba_array(c, alpha=None):
     # Note that this occurs *after* handling inputs that are already arrays, as
     # `to_rgba(c, alpha)` (below) is expensive for such inputs, due to the need
     # to format the array in the ValueError message(!).
-    if isinstance(c, str) and c.lower() == "none":
+    if cbook._str_lower_equal(c, "none"):
         return np.zeros((0, 4), float)
     try:
         return np.array([to_rgba(c, alpha)], float)
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -354,10 +354,8 @@ def __init__(self, xdata, ydata,
         if isinstance(linestyle, six.string_types):
             ds, ls = self._split_drawstyle_linestyle(linestyle)
             if ds is not None and drawstyle is not None and ds != drawstyle:
-                raise ValueError("Inconsistent drawstyle ({0!r}) and "
-                                 "linestyle ({1!r})".format(drawstyle,
-                                                            linestyle)
-                                 )
+                raise ValueError("Inconsistent drawstyle ({!r}) and linestyle "
+                                 "({!r})".format(drawstyle, linestyle))
             linestyle = ls
 
             if ds is not None:
@@ -863,7 +861,7 @@ def get_marker(self):
 
     def get_markeredgecolor(self):
         mec = self._markeredgecolor
-        if isinstance(mec, six.string_types) and mec == 'auto':
+        if cbook._str_equal(mec, 'auto'):
             if rcParams['_internal.classic_mode']:
                 if self._marker.get_marker() in ('.', ','):
                     return self._color
@@ -1088,10 +1086,9 @@ def set_linestyle(self, ls):
                 try:
                     ls = ls_mapper_r[ls]
                 except KeyError:
-                    raise ValueError(("You passed in an invalid linestyle, "
-                                      "`{0}`.  See "
-                                      "docs of Line2D.set_linestyle for "
-                                      "valid values.").format(ls))
+                    raise ValueError("Invalid linestyle {!r}; see docs of "
+                                     "Line2D.set_linestyle for valid values"
+                                     .format(ls))
             self._linestyle = ls
         else:
             self._linestyle = '--'
@@ -1128,8 +1125,8 @@ def set_markeredgecolor(self, ec):
         """
         if ec is None:
             ec = 'auto'
-        if self._markeredgecolor is None or \
-           np.any(self._markeredgecolor != ec):
+        if (self._markeredgecolor is None
+                or np.any(self._markeredgecolor != ec)):
             self.stale = True
         self._markeredgecolor = ec
 
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -249,8 +249,8 @@ def set_marker(self, marker):
                 Path(marker)
                 self._marker_function = self._set_vertices
             except ValueError:
-                raise ValueError('Unrecognized marker style'
-                                 ' {0}'.format(marker))
+                raise ValueError('Unrecognized marker style {!r}'
+                                 .format(marker))
 
         self._marker = marker
         self._recache()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -65,16 +65,16 @@ def get_unicode_index(symbol, math=True):
     # length, usually longer than a hyphen.
     if symbol == '-':
         return 0x2212
-    try:# This will succeed if symbol is a single unicode char
+    try:  # This will succeed if symbol is a single unicode char
         return ord(symbol)
     except TypeError:
         pass
-    try:# Is symbol a TeX symbol (i.e. \alpha)
+    try:  # Is symbol a TeX symbol (i.e. \alpha)
         return tex2uni[symbol.strip("\\")]
     except KeyError:
-        message = """'%(symbol)s' is not a valid Unicode character or
-TeX/Type1 symbol"""%locals()
-        raise ValueError(message)
+        raise ValueError(
+            "'{}' is not a valid Unicode character or TeX/Type1 symbol"
+            .format(symbol))
 
 
 unichr_safe = cbook.deprecated("3.0")(chr)
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -63,7 +63,7 @@ def __call__(self, s):
             s = s.lower()
         if s in self.valid:
             return self.valid[s]
-        raise ValueError('Unrecognized %s string "%s": valid strings are %s'
+        raise ValueError('Unrecognized %s string %r: valid strings are %s'
                          % (self.key, s, list(six.itervalues(self.valid))))
 
 
@@ -889,7 +889,7 @@ def validate_cycler(s):
 
 
 def validate_hist_bins(s):
-    if isinstance(s, six.string_types) and s == 'auto':
+    if cbook._str_equal(s, "auto"):
         return s
     try:
         return int(s)
@@ -942,25 +942,13 @@ def _validate_linestyle(ls):
     A validator for all possible line styles, the named ones *and*
     the on-off ink sequences.
     """
-    # Look first for a valid named line style, like '--' or 'solid'
-    if isinstance(ls, six.string_types):
-        try:
-            return _validate_named_linestyle(ls)
-        except (UnicodeDecodeError, KeyError):
-            # On Python 2, string-like *ls*, like for example
-            # 'solid'.encode('utf-16'), may raise a unicode error.
-            raise ValueError("the linestyle string {!r} is not a valid "
-                             "string.".format(ls))
-
-    if isinstance(ls, (bytes, bytearray)):
-        # On Python 2, a string-like *ls* should already have lead to a
-        # successful return or to raising an exception. On Python 3, we have
-        # to manually raise an exception in the case of a byte-like *ls*.
-        # Otherwise, if *ls* is of even-length, it will be passed to the
-        # instance of validate_nseq_float, which will return an absurd on-off
-        # ink sequence...
-        raise ValueError("linestyle {!r} neither looks like an on-off ink "
-                         "sequence nor a valid string.".format(ls))
+    # Look first for a valid named line style, like '--' or 'solid' Also
+    # includes bytes(-arrays) here (they all fail _validate_named_linestyle);
+    # otherwise, if *ls* is of even-length, it will be passed to the instance
+    # of validate_nseq_float, which will return an absurd on-off ink
+    # sequence...
+    if isinstance(ls, (str, bytes, bytearray)):
+        return _validate_named_linestyle(ls)
 
     # Look for an on-off ink sequence (in points) *of even length*.
     # Offset is set to None.
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -241,13 +241,13 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):
 
         Artist.__init__(self)
 
-        if isinstance(loc, str) and loc not in self.codes:
-            warnings.warn('Unrecognized location %s. Falling back on '
-                          'bottom; valid locations are\n%s\t' %
-                          (loc, '\n\t'.join(self.codes)))
-            loc = 'bottom'
         if isinstance(loc, str):
-            loc = self.codes.get(loc, 1)
+            if loc not in self.codes:
+                warnings.warn('Unrecognized location %s. Falling back on '
+                              'bottom; valid locations are\n%s\t' %
+                              (loc, '\n\t'.join(self.codes)))
+                loc = 'bottom'
+            loc = self.codes[loc]
         self.set_figure(ax.figure)
         self._axes = ax
         self._loc = loc
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1237,7 +1237,7 @@ def __init__(self, unit="", places=None, sep=" "):
     def __call__(self, x, pos=None):
         s = "%s%s" % (self.format_eng(x), self.unit)
         # Remove the trailing separator when there is neither prefix nor unit
-        if len(self.sep) > 0 and s.endswith(self.sep):
+        if self.sep and s.endswith(self.sep):
             s = s[:-len(self.sep)]
         return self.fix_minus(s)
 
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -315,7 +315,7 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
 
         subplots.append(ax)
 
-    if (len(nrows_list) == 0) or (len(ncols_list) == 0):
+    if len(nrows_list) == 0 or len(ncols_list) == 0:
         return {}
 
     max_nrows = max(nrows_list)
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
@@ -137,7 +137,7 @@ def get_from_args_and_kwargs(*args, **kwargs):
             # Check triangles in kwargs then args.
             triangles = kwargs.pop('triangles', None)
             from_args = False
-            if triangles is None and len(args) > 0:
+            if triangles is None and args:
                 triangles = args[0]
                 from_args = True
 
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
@@ -81,7 +81,7 @@ def _read(self, file):
             return rawdata
 
         data = b''
-        while len(rawdata) > 0:
+        while rawdata:
             if not rawdata.startswith(b'\x80'):
                 raise RuntimeError('Broken pfb file (expected byte 128, '
                                    'got %d)' % ord(rawdata[0]))
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -917,7 +917,7 @@ def on_text_change(self, func):
 
     def on_submit(self, func):
         """
-        When the user hits enter or leaves the submision box, call this
+        When the user hits enter or leaves the submission box, call this
         *func* with event.
 
         A connection id is returned which can be used to disconnect.
@@ -928,8 +928,8 @@ def on_submit(self, func):
         return cid
 
     def disconnect(self, cid):
-        """remove the observer with connection id *cid*"""
-        for reg in (self.change_observers, self.submit_observers):
+        """Remove the observer with connection id *cid*."""
+        for reg in [self.change_observers, self.submit_observers]:
             try:
                 del reg[cid]
             except KeyError:
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -525,9 +525,9 @@ def autoscale_view(self, tight=None, scalex=True, scaley=True,
         # of data and decides how to scale the view portal to fit it.
         if tight is None:
             # if image data only just use the datalim
-            _tight = self._tight or (len(self.images)>0 and
-                                     len(self.lines)==0 and
-                                     len(self.patches)==0)
+            _tight = self._tight or (
+                len(self.images) > 0
+                and len(self.lines) == len(self.patches) == 0)
         else:
             _tight = self._tight = bool(tight)
 
diff --git a/setupext.py b/setupext.py
@@ -251,7 +251,7 @@ def get_file_hash(filename):
     hasher = hashlib.sha256()
     with open(filename, 'rb') as fd:
         buf = fd.read(BLOCKSIZE)
-        while len(buf) > 0:
+        while buf:
             hasher.update(buf)
             buf = fd.read(BLOCKSIZE)
     return hasher.hexdigest()
@@ -268,11 +268,7 @@ def __init__(self):
         if sys.platform == 'win32':
             self.has_pkgconfig = False
         else:
-            try:
-                self.pkg_config = os.environ['PKG_CONFIG']
-            except KeyError:
-                self.pkg_config = 'pkg-config'
-
+            self.pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
             self.set_pkgconfig_path()
             self.has_pkgconfig = shutil.which(self.pkg_config) is not None
             if not self.has_pkgconfig:
diff --git a/tools/gh_api.py b/tools/gh_api.py
@@ -1,17 +1,12 @@
 """Functions for Github API requests."""
 
-try:
-    input = raw_input
-except NameError:
-    pass
-
+import getpass
+import json
 import os
 import re
 import sys
 
 import requests
-import getpass
-import json
 
 try:
     import requests_cache
