Style fixes for the latest flake8

Author: dstufft

pip/basecommand.py

@@ -220,8 +220,8 @@ def main(self, args):
                 sys.exit(VIRTUALENV_NOT_FOUND)
 
         # Check if we're using the latest version of pip available
-        if (not options.disable_pip_version_check
-                and not getattr(options, "no_index", False)):
+        if (not options.disable_pip_version_check and not
+                getattr(options, "no_index", False)):
             with self._build_session(
                     options,
                     retries=0,

pip/commands/install.py

@@ -211,8 +211,8 @@ def run(self, options, args):
 
         # If we have --no-install or --no-download and no --build we use the
         # legacy static build dir
-        if (options.build_dir is None
-                and (options.no_install or options.no_download)):
+        if (options.build_dir is None and
+                (options.no_install or options.no_download)):
             options.build_dir = build_prefix
 
         if options.download_dir:
@@ -237,8 +237,8 @@ def run(self, options, args):
             options.ignore_installed = True
             temp_target_dir = tempfile.mkdtemp()
             options.target_dir = os.path.abspath(options.target_dir)
-            if (os.path.exists(options.target_dir)
-                    and not os.path.isdir(options.target_dir)):
+            if (os.path.exists(options.target_dir) and not
+                    os.path.isdir(options.target_dir)):
                 raise CommandError(
                     "Target path exists but is not a directory, will not "
                     "continue."
@@ -376,9 +376,9 @@ def run(self, options, args):
                     raise
                 finally:
                     # Clean up
-                    if ((not options.no_clean)
-                            and ((not options.no_install)
-                                 or options.download_dir)):
+                    if ((not options.no_clean) and
+                            ((not options.no_install) or
+                                options.download_dir)):
                         requirement_set.cleanup_files()
 
         if options.target_dir:

pip/commands/zip.py

@@ -152,8 +152,8 @@ def run(self, options, args):
 
     def unzip_package(self, module_name, filename):
         zip_filename = os.path.dirname(filename)
-        if (not os.path.isfile(zip_filename)
-                and zipfile.is_zipfile(zip_filename)):
+        if (not os.path.isfile(zip_filename) and
+                zipfile.is_zipfile(zip_filename)):
             raise InstallationError(
                 'Module %s (in %s) isn\'t located in a zip file in %s'
                 % (module_name, filename, zip_filename))
@@ -355,9 +355,9 @@ def list(self, options, args):
                 if os.path.dirname(path) not in self.paths():
                     logger.info('Zipped egg: %s', display_path(path))
                 continue
-            if (basename != 'site-packages'
-                    and basename != 'dist-packages'
-                    and not path.replace('\\', '/').endswith('lib/python')):
+            if (basename != 'site-packages' and
+                    basename != 'dist-packages' and not
+                    path.replace('\\', '/').endswith('lib/python')):
                 continue
             logger.info('In %s:', display_path(path))
 

pip/compat/__init__.py

@@ -99,5 +99,5 @@ def get_path_uid(path):
 
 
 # windows detection, covers cpython and ironpython
-WINDOWS = (sys.platform.startswith("win")
-           or (sys.platform == 'cli' and os.name == 'nt'))
+WINDOWS = (sys.platform.startswith("win") or
+           (sys.platform == 'cli' and os.name == 'nt'))

pip/download.py

@@ -376,8 +376,8 @@ def get_file_content(url, comes_from=None, session=None):
     match = _scheme_re.search(url)
     if match:
         scheme = match.group(1).lower()
-        if (scheme == 'file' and comes_from
-                and comes_from.startswith('http')):
+        if (scheme == 'file' and comes_from and
+                comes_from.startswith('http')):
             raise InstallationError(
                 'Requirements file %s references URL %s, which is local'
                 % (comes_from, url))

pip/index.py

@@ -228,8 +228,8 @@ def _validate_secure_origin(self, logger, location):
                 addr = ipaddress.ip_address(
                     origin[1]
                     if (
-                        isinstance(origin[1], six.text_type)
-                        or origin[1] is None
+                        isinstance(origin[1], six.text_type) or
+                        origin[1] is None
                     )
                     else origin[1].decode("utf8")
                 )
@@ -250,9 +250,9 @@ def _validate_secure_origin(self, logger, location):
                     continue
 
             # Check to see if the port patches
-            if (origin[2] != secure_origin[2]
-                    and secure_origin[2] != "*"
-                    and secure_origin[2] is not None):
+            if (origin[2] != secure_origin[2] and
+                    secure_origin[2] != "*" and
+                    secure_origin[2] is not None):
                 continue
 
             # If we've gotten here, then this origin matches the current
@@ -369,10 +369,10 @@ def mkurl_pypi_url(url):
                 req.name.lower()
             )
         )
-        if (not found_versions
-                and not page_versions
-                and not dependency_versions
-                and not file_versions):
+        if (not found_versions and not
+                page_versions and not
+                dependency_versions and not
+                file_versions):
             logger.critical(
                 'Could not find any downloads that satisfy the requirement %s',
                 req,
@@ -417,8 +417,8 @@ def mkurl_pypi_url(url):
 
         # This is an intentional priority ordering
         all_versions = (
-            file_versions + found_versions + page_versions
-            + dependency_versions
+            file_versions + found_versions + page_versions +
+            dependency_versions
         )
 
         # Filter out anything which doesn't match our specifier
@@ -496,8 +496,8 @@ def mkurl_pypi_url(url):
                 'Installed version (%s) is most up-to-date (past versions: '
                 '%s)',
                 req.satisfied_by.version,
-                ', '.join(str(i.version) for i in applicable_versions[1:])
-                or "none",
+                ', '.join(str(i.version) for i in applicable_versions[1:]) or
+                "none",
             )
             raise BestVersionAlreadyInstalled
 
@@ -510,8 +510,8 @@ def mkurl_pypi_url(url):
 
         selected_version = applicable_versions[0].location
 
-        if (selected_version.verifiable is not None
-                and not selected_version.verifiable):
+        if (selected_version.verifiable is not None and not
+                selected_version.verifiable):
             logger.warning(
                 "%s is potentially insecure and unverifiable.", req.name,
             )
@@ -572,8 +572,8 @@ def _get_pages(self, locations, req):
             for link in page.rel_links():
                 normalized = normalize_name(req.name).lower()
 
-                if (normalized not in self.allow_external
-                        and not self.allow_all_external):
+                if (normalized not in self.allow_external and not
+                        self.allow_all_external):
                     self.need_warn_external = True
                     logger.debug(
                         "Not searching %s for files because external "
@@ -582,9 +582,9 @@ def _get_pages(self, locations, req):
                     )
                     continue
 
-                if (link.trusted is not None
-                        and not link.trusted
-                        and normalized not in self.allow_unverified):
+                if (link.trusted is not None and not
+                        link.trusted and
+                        normalized not in self.allow_unverified):
                     logger.debug(
                         "Not searching %s for urls, it is an "
                         "untrusted link and cannot produce safe or "
@@ -675,8 +675,8 @@ def _link_package_versions(self, link, search_name):
                         link
                     )
                     return
-                if (pkg_resources.safe_name(wheel.name).lower()
-                        != pkg_resources.safe_name(search_name).lower()):
+                if (pkg_resources.safe_name(wheel.name).lower() !=
+                        pkg_resources.safe_name(search_name).lower()):
                     logger.debug(
                         'Skipping link %s; wrong project name (not %s)',
                         link,
@@ -699,12 +699,12 @@ def _link_package_versions(self, link, search_name):
                 comes_from = getattr(link, "comes_from", None)
                 if (
                         (
-                            not platform.startswith('win')
-                            and not platform.startswith('macosx')
-                            and not platform == 'cli'
-                        )
-                        and comes_from is not None
-                        and urllib_parse.urlparse(
+                            not platform.startswith('win') and not
+                            platform.startswith('macosx') and not
+                            platform == 'cli'
+                        ) and
+                        comes_from is not None and
+                        urllib_parse.urlparse(
                             comes_from.url
                         ).netloc.endswith(PyPI.netloc)):
                     if not wheel.supported(tags=supported_tags_noarch):
@@ -726,21 +726,21 @@ def _link_package_versions(self, link, search_name):
             )
             return
 
-        if (link.internal is not None
-                and not link.internal
-                and not normalize_name(search_name).lower()
-                in self.allow_external
-                and not self.allow_all_external):
+        if (link.internal is not None and not
+                link.internal and not
+                normalize_name(search_name).lower()
+                in self.allow_external and not
+                self.allow_all_external):
             # We have a link that we are sure is external, so we should skip
             #   it unless we are allowing externals
             logger.debug("Skipping %s because it is externally hosted.", link)
             self.need_warn_external = True
             return
 
-        if (link.verifiable is not None
-                and not link.verifiable
-                and not (normalize_name(search_name).lower()
-                         in self.allow_unverified)):
+        if (link.verifiable is not None and not
+                link.verifiable and not
+                (normalize_name(search_name).lower()
+                    in self.allow_unverified)):
             # We have a link that we are sure we cannot verify its integrity,
             #   so we should skip it unless we are allowing unsafe installs
             #   for this requirement.
@@ -856,8 +856,8 @@ def get_page(cls, link, req, skip_archives=True, session=None):
             # Tack index.html onto file:// URLs that point to directories
             (scheme, netloc, path, params, query, fragment) = \
                 urllib_parse.urlparse(url)
-            if (scheme == 'file'
-                    and os.path.isdir(urllib_request.url2pathname(path))):
+            if (scheme == 'file' and
+                    os.path.isdir(urllib_request.url2pathname(path))):
                 # add trailing slash if not present so urljoin doesn't trim
                 # final segment
                 if not url.endswith('/'):
@@ -978,8 +978,8 @@ def links(self):
                     # Only api_versions >= 2 have a distinction between
                     #   external and internal links
                     internal = bool(
-                        anchor.get("rel")
-                        and "internal" in anchor.get("rel").split()
+                        anchor.get("rel") and
+                        "internal" in anchor.get("rel").split()
                     )
 
                 yield Link(url, self, internal=internal)
@@ -1016,9 +1016,9 @@ def scraped_rel_links(self):
             if not href_match:
                 continue
             url = (
-                href_match.group(1)
-                or href_match.group(2)
-                or href_match.group(3)
+                href_match.group(1) or
+                href_match.group(2) or
+                href_match.group(3)
             )
             if not url:
                 continue

pip/operations/freeze.py

@@ -54,10 +54,10 @@ def freeze(
     if requirement:
         with open(requirement) as req_file:
             for line in req_file:
-                if (not line.strip()
-                        or line.strip().startswith('#')
-                        or (skip_match and skip_match.search(line))
-                        or line.startswith((
+                if (not line.strip() or
+                        line.strip().startswith('#') or
+                        (skip_match and skip_match.search(line)) or
+                        line.startswith((
                             '-r', '--requirement',
                             '-Z', '--always-unzip',
                             '-f', '--find-links',

pip/req/req_install.py

@@ -134,8 +134,8 @@ def from_line(cls, name, comes_from=None, isolated=False):
 
         if is_url(name):
             link = Link(name)
-        elif (os.path.isdir(path)
-                and (os.path.sep in name or name.startswith('.'))):
+        elif (os.path.isdir(path) and
+                (os.path.sep in name or name.startswith('.'))):
             if not is_installable_dir(path):
                 raise InstallationError(
                     "Directory %r is not installable. File 'setup.py' not "
@@ -323,8 +323,8 @@ def run_egg_info(self):
             # NOTE: this self.name check only works when installing from a
             #       specifier (not archive path/urls)
             # TODO: take this out later
-            if (self.name == 'distribute'
-                    and not os.path.isdir(
+            if (self.name == 'distribute' and not
+                    os.path.isdir(
                         os.path.join(self.source_dir, 'setuptools'))):
                 rmtree(os.path.join(self.source_dir, 'distribute.egg-info'))
 
@@ -431,8 +431,8 @@ def egg_info_path(self, filename):
                         if (
                                 os.path.exists(
                                     os.path.join(root, dir, 'bin', 'python')
-                                )
-                                or os.path.exists(
+                                ) or
+                                os.path.exists(
                                     os.path.join(
                                         root, dir, 'Scripts', 'Python.exe'
                                     )
@@ -457,8 +457,8 @@ def egg_info_path(self, filename):
             # an extracted tarball for testing purposes.
             if len(filenames) > 1:
                 filenames.sort(
-                    key=lambda x: x.count(os.path.sep)
-                    + (os.path.altsep and x.count(os.path.altsep) or 0)
+                    key=lambda x: x.count(os.path.sep) +
+                    (os.path.altsep and x.count(os.path.altsep) or 0)
                 )
             self._egg_info_path = os.path.join(base, filenames[0])
         return os.path.join(self._egg_info_path, filename)
@@ -878,10 +878,10 @@ def install_editable(self, install_options, global_options=()):
                     "import setuptools, tokenize; __file__=%r; exec(compile("
                     "getattr(tokenize, 'open', open)(__file__).read().replace"
                     "('\\r\\n', '\\n'), __file__, 'exec'))" % self.setup_py
-                ]
-                + list(global_options)
-                + ['develop', '--no-deps']
-                + list(install_options),
+                ] +
+                list(global_options) +
+                ['develop', '--no-deps'] +
+                list(install_options),
 
                 cwd=cwd, filter_stdout=self._filter_install,
                 show_stdout=False)
@@ -924,9 +924,9 @@ def check_if_exists(self):
             # then this check has already run before.  we don't want it to
             # run again, and return False, since it would block the uninstall
             # TODO: remove this later
-            if (self.req.project_name == 'setuptools'
-                    and self.conflicts_with
-                    and self.conflicts_with.project_name == 'distribute'):
+            if (self.req.project_name == 'setuptools' and
+                    self.conflicts_with and
+                    self.conflicts_with.project_name == 'distribute'):
                 return True
             else:
                 self.satisfied_by = pkg_resources.get_distribution(self.req)
@@ -939,8 +939,8 @@ def check_if_exists(self):
             if self.use_user_site:
                 if dist_in_usersite(existing_dist):
                     self.conflicts_with = existing_dist
-                elif (running_under_virtualenv()
-                        and dist_in_site_packages(existing_dist)):
+                elif (running_under_virtualenv() and
+                        dist_in_site_packages(existing_dist)):
                     raise InstallationError(
                         "Will not install to the user site because it will "
                         "lack sys.path precedence to %s in %s" %