Sort imports and minor Flake8 changes (#4520)

* Run isort on the codebase

Command: isort --recursive --skip __main__.py --skip _vendor -o pip._vendor -sd THIRDPARTY -m 5 -p pip -p tests ./pip ./tests

* 📰

news/4520.trivial

@@ -0,0 +1 @@
+Sort imports, again.

pip/commands/download.py

@@ -9,8 +9,8 @@ from pip.exceptions import CommandError
 from pip.index import FormatControl
 from pip.req import RequirementSet
 from pip.utils import ensure_dir, normalize_path
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.filesystem import check_path_owner
+from pip.utils.temp_dir import TempDirectory
 
 logger = logging.getLogger(__name__)
 

pip/commands/install.py

@@ -5,10 +5,6 @@ import logging
 import operator
 import os
 import shutil
-try:
-    import wheel
-except ImportError:
-    wheel = None
 
 from pip import cmdoptions
 from pip.basecommand import RequirementCommand
@@ -19,8 +15,8 @@ from pip.locations import distutils_scheme, virtualenv_no_global
 from pip.req import RequirementSet
 from pip.status_codes import ERROR
 from pip.utils import ensure_dir, get_installed_version
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.filesystem import check_path_owner
+from pip.utils.temp_dir import TempDirectory
 from pip.wheel import WheelBuilder, WheelCache
 
 try:
@@ -29,6 +25,12 @@ except ImportError:
     wheel = None
 
 
+try:
+    import wheel
+except ImportError:
+    wheel = None
+
+
 logger = logging.getLogger(__name__)
 
 

pip/compat.py

@@ -2,11 +2,11 @@
 distributions."""
 from __future__ import absolute_import, division
 
-import os
-import sys
 import codecs
 import locale
 import logging
+import os
+import sys
 
 from pip._vendor.six import text_type
 

pip/utils/temp_dir.py

@@ -6,7 +6,6 @@ import tempfile
 
 from pip.utils import rmtree
 
-
 logger = logging.getLogger(__name__)
 
 

pip/vcs/bazaar.py

@@ -10,7 +10,6 @@ from pip.utils import display_path, rmtree
 from pip.utils.temp_dir import TempDirectory
 from pip.vcs import VersionControl, vcs
 
-
 logger = logging.getLogger(__name__)
 
 

pip/vcs/mercurial.py

@@ -8,7 +8,7 @@ from pip._vendor.six.moves import configparser
 from pip.download import path_to_url
 from pip.utils import display_path
 from pip.utils.temp_dir import TempDirectory
-from pip.vcs import vcs, VersionControl
+from pip.vcs import VersionControl, vcs
 
 logger = logging.getLogger(__name__)
 

pip/wheel.py

@@ -18,6 +18,12 @@ import sys
 import warnings
 from base64 import urlsafe_b64encode
 from email.parser import Parser
+from sysconfig import get_paths
+
+from pip._vendor import pkg_resources, pytoml
+from pip._vendor.distlib.scripts import ScriptMaker
+from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.six import StringIO
 
 import pip
 from pip import pep425tags
@@ -27,20 +33,11 @@ from pip.exceptions import (
     InstallationError, InvalidWheelFilename, UnsupportedWheel
 )
 from pip.locations import PIP_DELETE_MARKER_FILENAME, distutils_scheme
-from pip.utils import (
-    call_subprocess, captured_stdout, ensure_dir, read_chunks
-)
+from pip.utils import call_subprocess, captured_stdout, ensure_dir, read_chunks
 from pip.utils.logging import indent_log
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.setuptools_build import SETUPTOOLS_SHIM
+from pip.utils.temp_dir import TempDirectory
 from pip.utils.ui import open_spinner
-from pip._vendor.distlib.scripts import ScriptMaker
-from pip._vendor import pkg_resources
-from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor import pytoml
-from pip._vendor.six import StringIO
-
-from sysconfig import get_paths
 
 wheel_ext = '.whl'
 

tests/conftest.py

@@ -3,10 +3,10 @@ import os
 import shutil
 import sys
 
+import pytest
 import six
 
 import pip
-import pytest
 from pip.utils import appdirs
 from tests.lib import SRC_DIR, TestData
 from tests.lib.path import Path

tests/data/packages/symlinks/docs

@@ -1 +0,0 @@
-doc

tests/data/src/pep518-3.0/setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(name='pep518',
       version='3.0',

tests/functional/test_download.py

@@ -2,6 +2,7 @@ import os
 import textwrap
 
 import pytest
+
 from pip.status_codes import ERROR
 from tests.lib.path import Path
 

tests/functional/test_freeze.py

@@ -5,6 +5,7 @@ import textwrap
 from doctest import ELLIPSIS, OutputChecker
 
 import pytest
+
 from tests.lib import _create_test_package, _create_test_package_with_srcdir
 
 distribute_re = re.compile('^distribute==[0-9.]+\n', re.MULTILINE)

tests/functional/test_help.py

@@ -1,5 +1,6 @@
 import pytest
 from mock import Mock
+
 from pip.basecommand import ERROR, SUCCESS
 from pip.commands import commands_dict as commands
 from pip.commands.help import HelpCommand

tests/functional/test_install.py

@@ -5,6 +5,7 @@ import textwrap
 from os.path import curdir, join, pardir
 
 import pytest
+
 from pip import pep425tags
 from pip.status_codes import ERROR
 from pip.utils import appdirs, rmtree

tests/functional/test_install_cleanup.py

@@ -2,6 +2,7 @@ import os
 from os.path import exists
 
 import pytest
+
 from pip.locations import write_delete_marker_file
 from pip.status_codes import PREVIOUS_BUILD_DIR_ERROR
 from tests.lib.local_repos import local_checkout

tests/functional/test_install_compat.py

@@ -5,6 +5,7 @@ Tests for compatibility workarounds.
 import os
 
 import pytest
+
 from tests.lib import assert_all_changes, pyversion
 
 

tests/functional/test_install_reqs.py

@@ -2,6 +2,7 @@ import os.path
 import textwrap
 
 import pytest
+
 from tests.lib import (
     _create_test_package_with_subdirectory, pyversion, requirements_file
 )

tests/functional/test_install_upgrade.py

@@ -3,6 +3,7 @@ import sys
 import textwrap
 
 import pytest
+
 from tests.lib import assert_all_changes, pyversion
 from tests.lib.local_repos import local_checkout
 

tests/functional/test_install_user.py

@@ -6,6 +6,7 @@ import textwrap
 from os.path import curdir, isdir, isfile
 
 import pytest
+
 from pip.compat import cache_from_source, uses_pycache
 from tests.lib import pyversion
 from tests.lib.local_repos import local_checkout

tests/functional/test_install_vcs.py

@@ -1,4 +1,5 @@
 import pytest
+
 from tests.lib import (
     _change_test_package_version, _create_test_package, pyversion
 )

tests/functional/test_install_vcs_git.py

@@ -1,5 +1,6 @@
 import pytest
 from mock import patch
+
 from pip.vcs.git import Git
 from tests.lib import _create_test_package
 from tests.lib.git_submodule_helpers import (

tests/functional/test_install_vcs_svn.py

@@ -1,5 +1,6 @@
 import pytest
 from mock import patch
+
 from pip.vcs.subversion import Subversion
 
 

tests/functional/test_install_wheel.py

@@ -3,6 +3,7 @@ import os
 import sys
 
 import pytest
+
 from tests.lib.path import Path
 
 

tests/functional/test_search.py

@@ -1,4 +1,5 @@
 import pytest
+
 from pip.commands.search import (
     SearchCommand, highest_version, print_results, transform_hits
 )

tests/functional/test_show.py

@@ -1,6 +1,7 @@
 import re
 
 import pytest
+
 from pip import __version__
 from pip.commands.show import search_packages_info
 

tests/functional/test_uninstall.py

@@ -9,6 +9,7 @@ from tempfile import mkdtemp
 
 import pretend
 import pytest
+
 from pip.req import InstallRequirement
 from pip.utils import rmtree
 from tests.lib import assert_all_changes, create_test_package_with_setup

tests/functional/test_uninstall_user.py

@@ -4,6 +4,7 @@ tests specific to uninstalling --user installs
 from os.path import isdir, isfile
 
 import pytest
+
 from tests.functional.test_install_user import _patch_dist_in_site_packages
 from tests.lib import assert_all_changes, pyversion
 

tests/functional/test_wheel.py

@@ -3,6 +3,7 @@ import os
 from os.path import exists
 
 import pytest
+
 from pip.locations import write_delete_marker_file
 from pip.status_codes import ERROR, PREVIOUS_BUILD_DIR_ERROR
 from tests.lib import pyversion

tests/unit/test_appdirs.py

@@ -4,6 +4,7 @@ import posixpath
 import sys
 
 import pretend
+
 from pip.utils import appdirs
 
 

tests/unit/test_compat.py

@@ -1,8 +1,10 @@
 import locale
 import os
-import pip.compat
+
 import pytest
-from pip.compat import expanduser, get_path_uid, native_str, console_to_str
+
+import pip.compat
+from pip.compat import console_to_str, expanduser, get_path_uid, native_str
 
 
 def test_get_path_uid():

tests/unit/test_download.py

@@ -4,11 +4,11 @@ from io import BytesIO
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 
+import pytest
+from mock import Mock, patch
 from pip._vendor.six.moves.urllib import request as urllib_request
 
 import pip
-import pytest
-from mock import Mock, patch
 from pip.download import (
     MultiDomainBasicAuth, PipSession, SafeFileCache, path_to_url,
     unpack_file_url, unpack_http_url, url_to_path

tests/unit/test_finder.py

@@ -1,11 +1,11 @@
 import sys
 
+import pytest
+from mock import Mock, patch
 from pkg_resources import Distribution, parse_version
 
 import pip.pep425tags
 import pip.wheel
-import pytest
-from mock import Mock, patch
 from pip.download import PipSession
 from pip.exceptions import BestVersionAlreadyInstalled, DistributionNotFound
 from pip.index import (

tests/unit/test_index.py

@@ -1,6 +1,7 @@
 import os.path
 
 import pytest
+
 from pip.download import PipSession
 from pip.index import HTMLPage, Link, PackageFinder
 

tests/unit/test_locations.py

@@ -9,6 +9,7 @@ import sys
 import tempfile
 
 from mock import Mock
+
 from pip.locations import distutils_scheme
 
 if sys.platform == 'win32':

tests/unit/test_options.py

@@ -1,7 +1,8 @@
 import os
 
-import pip.configuration
 import pytest
+
+import pip.configuration
 from pip import cmdoptions, main
 from pip.basecommand import Command
 from pip.commands import commands_dict as commands

tests/unit/test_pep425tags.py

@@ -1,6 +1,7 @@
 import sys
 
 from mock import patch
+
 from pip import pep425tags
 
 

tests/unit/test_req.py

@@ -3,12 +3,12 @@ import shutil
 import sys
 import tempfile
 
+import pytest
+from mock import Mock, mock_open, patch
 from pip._vendor import pkg_resources
 from pip._vendor.packaging.markers import Marker
 from pip._vendor.packaging.requirements import Requirement
 
-import pytest
-from mock import Mock, mock_open, patch
 from pip.commands.install import InstallCommand
 from pip.download import PipSession, path_to_url
 from pip.exceptions import (

tests/unit/test_req_file.py

@@ -2,9 +2,11 @@ import os
 import subprocess
 import textwrap
 
-import pip
 import pytest
 from mock import Mock, patch
+from pretend import stub
+
+import pip
 from pip.download import PipSession
 from pip.exceptions import InstallationError, RequirementsFileParseError
 from pip.index import PackageFinder
@@ -13,7 +15,6 @@ from pip.req.req_file import (
     preprocess, process_line, skip_regex
 )
 from pip.req.req_install import InstallRequirement
-from pretend import stub
 from tests.lib import requirements_file
 
 

tests/unit/test_req_install.py

@@ -2,6 +2,7 @@ import os
 import tempfile
 
 import pytest
+
 from pip.req.req_install import InstallRequirement
 
 

tests/unit/test_req_uninstall.py

@@ -1,8 +1,9 @@
 import os
 
-import pip.req.req_uninstall
 import pytest
 from mock import Mock
+
+import pip.req.req_uninstall
 from pip.req.req_uninstall import UninstallPathSet, uninstallation_paths
 
 

tests/unit/test_unit_outdated.py

@@ -3,11 +3,11 @@ import os
 import sys
 from contextlib import contextmanager
 
-from pip._vendor import lockfile
-
 import freezegun
 import pretend
 import pytest
+from pip._vendor import lockfile
+
 from pip.index import InstallationCandidate
 from pip.utils import outdated
 

tests/unit/test_utils.py

@@ -12,10 +12,10 @@ import tempfile
 import time
 import warnings
 
-from pip._vendor.six import BytesIO
-
 import pytest
 from mock import Mock, patch
+from pip._vendor.six import BytesIO
+
 from pip.exceptions import (
     HashMismatch, HashMissing, InstallationError, UnsupportedPythonVersion
 )
@@ -23,11 +23,11 @@ from pip.utils import (
     egg_link_path, ensure_dir, get_installed_distributions, normalize_path,
     rmtree, untar_file, unzip_file
 )
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.encoding import auto_decode
 from pip.utils.glibc import check_glibc_version
 from pip.utils.hashes import Hashes, MissingHashes
 from pip.utils.packaging import check_dist_requires_python
+from pip.utils.temp_dir import TempDirectory
 
 
 class Tests_EgglinkPath:

tests/unit/test_vcs.py

@@ -1,7 +1,7 @@
-from pip._vendor.packaging.version import parse as parse_version
-
 import pytest
 from mock import Mock
+from pip._vendor.packaging.version import parse as parse_version
+
 from pip.vcs import VersionControl
 from pip.vcs.bazaar import Bazaar
 from pip.vcs.git import Git

tests/unit/test_wheel.py

@@ -1,10 +1,10 @@
 """Tests for wheel binary packages and .dist-info."""
 import os
 
-from pip._vendor.packaging.requirements import Requirement
-
 import pytest
 from mock import Mock, patch
+from pip._vendor.packaging.requirements import Requirement
+
 from pip import pep425tags, wheel
 from pip.compat import WINDOWS, expanduser
 from pip.exceptions import InvalidWheelFilename, UnsupportedWheel