Improve rcsetup.py flake8 compliance. (#12543)

hershen · timhoffm · commit 5e2e9c2305c9 · 2018-10-28T19:01:54.000+01:00
diff --git a/.flake8 b/.flake8
@@ -41,7 +41,7 @@ per-file-ignores =
     matplotlib/mathtext.py: E201, E202, E203, E211, E221, E222, E225, E251, E301, E402
     matplotlib/projections/geo.py: E203, E221, E502
     matplotlib/pylab.py: E501
-    matplotlib/rcsetup.py: E203, E225, E501
+    matplotlib/rcsetup.py: E501
     matplotlib/sphinxext/plot_directive.py: E402
     matplotlib/tests/test_mathtext.py: E501
     matplotlib/transforms.py: E201, E202, E203, E501
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -74,7 +74,8 @@ def f(s):
                 if allow_stringlist:
                     # Sometimes, a list of colors might be a single string
                     # of single-letter colornames. So give that a shot.
-                    return [scalar_validator(v.strip()) for v in s if v.strip()]
+                    return [scalar_validator(v.strip())
+                            for v in s if v.strip()]
                 else:
                     raise
         # We should allow any generic sequence type, including generators,
@@ -207,7 +208,7 @@ def validate_int(s):
 
 def validate_int_or_None(s):
     """if not None, tries to validate as an int"""
-    if s=='None':
+    if s == 'None':
         s = None
     if s is None:
         return None
@@ -1024,7 +1025,7 @@ def _validate_linestyle(ls):
     ## patch props
     'patch.linewidth':   [1.0, validate_float],     # line width in points
     'patch.edgecolor':   ['black', validate_color],
-    'patch.force_edgecolor' : [False, validate_bool],
+    'patch.force_edgecolor': [False, validate_bool],
     'patch.facecolor':   ['C0', validate_color],    # first color in cycle
     'patch.antialiased': [True, validate_bool],     # antialiased (no jaggies)
 
