flake8: fix W504 warnings, and ignore W503

Makefile

@@ -9,8 +9,10 @@ test-end2end:
 test-unit:
 	PYTHONPATH=..:$${PYTHONPATH} ${PYTHON} -m pytest `[ ! -z ${COVERAGE} ] && echo "--cov distgen"` tests/unittests/
 
+# Note that flake8 reports both W503 and W504 ATM :-/ so ignore W503 for now,
+# which is what should be considered the right setup.
 test-lint:
-	flake8 distgen/
+	flake8 distgen/ --ignore=W503
 
 # Check that testsuite in packaged sources work fine, too.
 test-sdist-check:

distgen/multispec.py

@@ -152,8 +152,8 @@ def get_distroinfos_by_distro(self, distro):
         return distroinfos
 
     def has_spec_group_item(self, group, item):
-        return (self.has_spec_group(group) and
-                item in self.get_spec_group(group))
+        return (self.has_spec_group(group)
+                and item in self.get_spec_group(group))
 
     def get_spec_group_item(self, group, item):
         return copy.deepcopy(self.get_spec_group(group)[item])
@@ -186,8 +186,8 @@ def process_combinations(data, distro, parsed_selectors):
             for k, v in data.items():
                 if k == DISTROINFO_GRP_DISTROS and distro not in v:
                     return False
-                elif (k != DISTROINFO_GRP_DISTROS and k in parsed_selectors and
-                      parsed_selectors[k] != v):
+                elif (k != DISTROINFO_GRP_DISTROS and k in parsed_selectors
+                      and parsed_selectors[k] != v):
                     return False
             return data.get('data', True)
 
@@ -218,8 +218,8 @@ def verify_selectors(self, selectors, distro):
                 )
 
         for selector_name in self.raw_data['specs'].keys():
-            if (selector_name != DISTROINFO_GRP and
-                    selector_name not in parsed_selectors):
+            if (selector_name != DISTROINFO_GRP
+                    and selector_name not in parsed_selectors):
                 return (
                     False,
                     '"{0}" selector must be present'.format(selector_name)