Merge pull request #16601 from anntzer/cleanup

QuLogic · web-flow · commit 2df1c542d690 · 2020-03-10T19:20:16.000-04:00
Small unrelated cleanups.
diff --git a/doc/sphinxext/missing_references.py b/doc/sphinxext/missing_references.py
@@ -139,9 +139,7 @@ def _truncate_location(location):
     This allows for easy comparison even when line numbers chagne
     (as they do regularily).
     """
-    if ":" in location:
-        return location.split(":", 1)[0]
-    return location
+    return location.split(":", 1)[0]
 
 
 def _warn_unused_missing_references(app):
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -538,8 +538,7 @@ def __init__(self, filename, metadata=None):
         self.pageAnnotations = []  # A list of annotations for the current page
 
         # The PDF spec recommends to include every procset
-        procsets = [Name(x)
-                    for x in "PDF Text ImageB ImageC ImageI".split()]
+        procsets = [Name(x) for x in "PDF Text ImageB ImageC ImageI".split()]
 
         # Write resource dictionary.
         # Possibly TODO: more general ExtGState (graphics state dictionaries)
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -916,10 +916,7 @@ def print_figure_impl(fh):
                 Ndict += len(ps_renderer._character_tracker.used)
             print("/mpldict %d dict def" % Ndict, file=fh)
             print("mpldict begin", file=fh)
-            for d in psDefs:
-                d = d.strip()
-                for l in d.split('\n'):
-                    print(l.strip(), file=fh)
+            print("\n".join(psDefs), file=fh)
             if not mpl.rcParams['ps.useafm']:
                 for font_path, chars \
                         in ps_renderer._character_tracker.used.items():
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -718,13 +718,10 @@ def validate_sketch(s):
         s = s.lower()
     if s == 'none' or s is None:
         return None
-    if isinstance(s, str):
-        result = tuple([float(v.strip()) for v in s.split(',')])
-    elif isinstance(s, (list, tuple)):
-        result = tuple([float(v) for v in s])
-    if len(result) != 3:
-        raise ValueError("path.sketch must be a tuple (scale, length, randomness)")
-    return result
+    try:
+        return tuple(validate_nseq_float(3)(s))
+    except ValueError:
+        raise ValueError("Expected a (scale, length, randomness) triplet")
 
 
 def _validate_greaterequal0_lessthan1(s):
