pep8 fixes.

pypa · Dec 11, 2017 · 2faebb1 · 2faebb1
1 parent acd661a
commit 2faebb1
Show file tree

Hide file tree

Showing 2 changed files with 148 additions and 101 deletions.
diff --git a/packaging/markers.py b/packaging/markers.py
@@ -118,7 +118,7 @@ def serialize(self):
 
 MARKER_EXTRA_VARIABLE = L('extra')
 MARKER_EXTRA_VARIABLE.setParseAction(lambda s, l, t: Variable(t[0]))
-MARKER_EXTRA_OP = (L("==") |L("===")) | L("not in") | L("in")
+MARKER_EXTRA_OP = (L("==") | L("===")) | L("not in") | L("in")
 MARKER_EXTRA_OP.setParseAction(lambda s, l, t: Op(t[0]))
 
 MARKER_OP = VERSION_CMP | L("not in") | L("in")
@@ -144,11 +144,16 @@ def serialize(self):
 MARKER = stringStart + MARKER_EXPR + stringEnd
 
 
-MARKER_EXTRA_ITEM = Group(MARKER_EXTRA_VARIABLE + MARKER_EXTRA_OP + MARKER_VALUE)
+MARKER_EXTRA_ITEM = Group(
+    MARKER_EXTRA_VARIABLE + MARKER_EXTRA_OP + MARKER_VALUE
+)
 MARKER_EXTRA_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
 MARKER_EXTRA_EXPR = Forward()
 
-MARKER_EXTRA_ATOM = MARKER_EXTRA_ITEM | Group(LPAREN + MARKER_EXTRA_EXPR + RPAREN)
+MARKER_EXTRA_GROUP = Group(LPAREN + MARKER_EXTRA_EXPR + RPAREN)
+MARKER_EXTRA_ATOM = MARKER_EXTRA_ITEM | MARKER_EXTRA_GROUP
+
+
 MARKER_EXTRA_EXPR << MARKER_EXTRA_ATOM + ZeroOrMore(BOOLOP + MARKER_EXTRA_EXPR)
 MARKER_EXTRA = stringStart + MARKER_EXTRA_EXPR + stringEnd
 
@@ -288,9 +293,13 @@ class Marker(object):
 
     def __init__(self, marker):
         self._marker_string = marker
-        extra_markers = MarkerExtraParser().get_extra_markers(self._marker_string)
+        extra_markers = MarkerExtraParser().get_extra_markers(
+            self._marker_string
+        )
         if extra_markers:
-            good_names = MarkerExtraCleaner().clean_marker_extras(extra_markers)
+            good_names = MarkerExtraCleaner().clean_marker_extras(
+                extra_markers
+            )
             self._markers = good_names
         else:
             self._markers = self.get_marker_not_extra(self._marker_string)
@@ -330,9 +339,11 @@ class MarkerExtraParser(object):
     @classmethod
     def get_extra_markers(cls, marker):
         try:
-            tmp_markers = _coerce_parse_result(MARKER_EXTRA.parseString(marker))
+            tmp_markers = _coerce_parse_result(
+                MARKER_EXTRA.parseString(marker)
+            )
             return tmp_markers
-        except:
+        except ParseException:
             return False
 
 
@@ -398,5 +409,7 @@ def check_attribute(obj, object_types, attribute_names, attribute_values):
     def _fix_extra_values(cls, extra_locations, marker):
         parsed_marker = list(marker)
         for extra_location in extra_locations:
-            parsed_marker[extra_location + 2].value = canonicalize_name(parsed_marker[extra_location + 2].value)
+            parsed_marker[extra_location + 2].value = canonicalize_name(
+                parsed_marker[extra_location + 2].value
+            )
         return tuple(parsed_marker)