Merge pull request #4881 from pradyunsg/misc/trailing-commas-imports

isort: Include trailing commas

31 files changed, 42 insertions, 41 deletions

diff --git a/setup.cfg b/setup.cfg
index c0e5180a2..15bb67240 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ known_first_party =
     pip
     tests
 default_section = THIRDPARTY
+include_trailing_comma = true
 
 [flake8]
 # Ignoring unused imports since mypy would warn of that.
diff --git a/src/pip/_internal/basecommand.py b/src/pip/_internal/basecommand.py
index bb6c8e8e8..7baacf954 100644
--- a/src/pip/_internal/basecommand.py
+++ b/src/pip/_internal/basecommand.py
@@ -10,13 +10,13 @@ import warnings
 
 from pip._internal import cmdoptions
 from pip._internal.baseparser import (
-    ConfigOptionParser, UpdatingDefaultsHelpFormatter
+    ConfigOptionParser, UpdatingDefaultsHelpFormatter,
 )
 from pip._internal.compat import WINDOWS
 from pip._internal.download import PipSession
 from pip._internal.exceptions import (
     BadCommand, CommandError, InstallationError, PreviousBuildDirError,
-    UninstallationError
+    UninstallationError,
 )
 from pip._internal.index import PackageFinder
 from pip._internal.locations import running_under_virtualenv
@@ -24,7 +24,7 @@ from pip._internal.req.req_file import parse_requirements
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.status_codes import (
     ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR,
-    VIRTUALENV_NOT_FOUND
+    VIRTUALENV_NOT_FOUND,
 )
 from pip._internal.utils import deprecation
 from pip._internal.utils.logging import IndentingFormatter
diff --git a/src/pip/_internal/cmdoptions.py b/src/pip/_internal/cmdoptions.py
index cdba7acb1..eaabdbde6 100644
--- a/src/pip/_internal/cmdoptions.py
+++ b/src/pip/_internal/cmdoptions.py
@@ -14,7 +14,7 @@ from functools import partial
 from optparse import SUPPRESS_HELP, Option, OptionGroup
 
 from pip._internal.index import (
-    FormatControl, fmt_ctl_handle_mutual_exclude, fmt_ctl_no_binary
+    FormatControl, fmt_ctl_handle_mutual_exclude, fmt_ctl_no_binary,
 )
 from pip._internal.locations import USER_CACHE_DIR, src_prefix
 from pip._internal.models import PyPI
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 56f3fbb02..cac15aac0 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -10,7 +10,7 @@ from pip._internal import cmdoptions
 from pip._internal.basecommand import RequirementCommand
 from pip._internal.cache import WheelCache
 from pip._internal.exceptions import (
-    CommandError, InstallationError, PreviousBuildDirError
+    CommandError, InstallationError, PreviousBuildDirError,
 )
 from pip._internal.locations import distutils_scheme, virtualenv_no_global
 from pip._internal.operations.prepare import RequirementPreparer
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 6593c407d..905200282 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -13,7 +13,7 @@ from pip._internal.exceptions import CommandError
 from pip._internal.index import PackageFinder
 from pip._internal.utils.deprecation import RemovedInPip11Warning
 from pip._internal.utils.misc import (
-    dist_is_editable, get_installed_distributions
+    dist_is_editable, get_installed_distributions,
 )
 from pip._internal.utils.packaging import get_installer
 
diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py
index abdedb696..6a05d6244 100644
--- a/src/pip/_internal/configuration.py
+++ b/src/pip/_internal/configuration.py
@@ -20,7 +20,7 @@ from pip._vendor.six.moves import configparser
 from pip._internal.exceptions import ConfigurationError
 from pip._internal.locations import (
     legacy_config_file, new_config_file, running_under_virtualenv,
-    site_config_files, venv_config_file
+    site_config_files, venv_config_file,
 )
 from pip._internal.utils.misc import ensure_dir, enum
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py
index 180ea77bf..d56a1bb3b 100644
--- a/src/pip/_internal/download.py
+++ b/src/pip/_internal/download.py
@@ -39,7 +39,7 @@ from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import (
     ARCHIVE_EXTENSIONS, ask_path_exists, backup_dir, call_subprocess, consume,
     display_path, format_size, get_installed_version, rmtree, splitext,
-    unpack_file
+    unpack_file,
 )
 from pip._internal.utils.setuptools_build import SETUPTOOLS_SHIM
 from pip._internal.utils.temp_dir import TempDirectory
diff --git a/src/pip/_internal/index.py b/src/pip/_internal/index.py
index ee6651420..7c1c210b6 100644
--- a/src/pip/_internal/index.py
+++ b/src/pip/_internal/index.py
@@ -25,7 +25,7 @@ from pip._internal.compat import ipaddress
 from pip._internal.download import HAS_TLS, is_url, path_to_url, url_to_path
 from pip._internal.exceptions import (
     BestVersionAlreadyInstalled, DistributionNotFound, InvalidWheelFilename,
-    UnsupportedWheel
+    UnsupportedWheel,
 )
 from pip._internal.models import PyPI
 from pip._internal.pep425tags import get_supported
@@ -33,7 +33,7 @@ from pip._internal.utils.deprecation import RemovedInPip11Warning
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import (
     ARCHIVE_EXTENSIONS, SUPPORTED_EXTENSIONS, cached_property, normalize_path,
-    splitext
+    splitext,
 )
 from pip._internal.utils.packaging import check_requires_python
 from pip._internal.wheel import Wheel, wheel_ext
diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py
index adaa8d093..4455f0c91 100644
--- a/src/pip/_internal/operations/freeze.py
+++ b/src/pip/_internal/operations/freeze.py
@@ -15,7 +15,7 @@ from pip._internal.req import InstallRequirement
 from pip._internal.req.req_file import COMMENT_RE
 from pip._internal.utils.deprecation import RemovedInPip11Warning
 from pip._internal.utils.misc import (
-    dist_is_editable, get_installed_distributions
+    dist_is_editable, get_installed_distributions,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
index 0e2b7536a..e1d8a2baa 100644
--- a/src/pip/_internal/operations/prepare.py
+++ b/src/pip/_internal/operations/prepare.py
@@ -8,11 +8,11 @@ from pip._vendor import pkg_resources, requests
 
 from pip._internal.compat import expanduser
 from pip._internal.download import (
-    is_dir_url, is_file_url, is_vcs_url, unpack_url, url_to_path
+    is_dir_url, is_file_url, is_vcs_url, unpack_url, url_to_path,
 )
 from pip._internal.exceptions import (
     DirectoryUrlHashUnsupported, HashUnpinned, InstallationError,
-    PreviousBuildDirError, VcsHashUnsupported
+    PreviousBuildDirError, VcsHashUnsupported,
 )
 from pip._internal.utils.hashes import MissingHashes
 from pip._internal.utils.logging import indent_log
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 43b85665b..d3b9dd428 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -24,11 +24,11 @@ from pip._vendor.pkg_resources import RequirementParseError, parse_requirements
 from pip._internal import wheel
 from pip._internal.compat import native_str
 from pip._internal.download import (
-    is_archive_file, is_url, path_to_url, url_to_path
+    is_archive_file, is_url, path_to_url, url_to_path,
 )
 from pip._internal.exceptions import InstallationError, UninstallationError
 from pip._internal.locations import (
-    PIP_DELETE_MARKER_FILENAME, running_under_virtualenv
+    PIP_DELETE_MARKER_FILENAME, running_under_virtualenv,
 )
 from pip._internal.req.req_uninstall import UninstallPathSet
 from pip._internal.utils.deprecation import RemovedInPip11Warning
@@ -37,7 +37,7 @@ from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import (
     _make_build_dir, ask_path_exists, backup_dir, call_subprocess,
     display_path, dist_in_site_packages, dist_in_usersite, ensure_dir,
-    get_installed_version, is_installable_dir, read_text_file, rmtree
+    get_installed_version, is_installable_dir, read_text_file, rmtree,
 )
 from pip._internal.utils.setuptools_build import SETUPTOOLS_SHIM
 from pip._internal.utils.temp_dir import TempDirectory
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index 31271a17c..a7c0870a7 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -15,7 +15,7 @@ from pip._internal.locations import bin_py, bin_user
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import (
     FakeFile, ask, dist_in_usersite, dist_is_local, egg_link_path, is_local,
-    normalize_path, renames
+    normalize_path, renames,
 )
 from pip._internal.utils.temp_dir import TempDirectory
 
diff --git a/src/pip/_internal/resolve.py b/src/pip/_internal/resolve.py
index 0c22ee9c9..e84b6dc85 100644
--- a/src/pip/_internal/resolve.py
+++ b/src/pip/_internal/resolve.py
@@ -15,7 +15,7 @@ from itertools import chain
 
 from pip._internal.exceptions import (
     BestVersionAlreadyInstalled, DistributionNotFound, HashError, HashErrors,
-    UnsupportedPythonVersion
+    UnsupportedPythonVersion,
 )
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.logging import indent_log
diff --git a/src/pip/_internal/utils/hashes.py b/src/pip/_internal/utils/hashes.py
index 3a4cd3e62..8b909ba15 100644
--- a/src/pip/_internal/utils/hashes.py
+++ b/src/pip/_internal/utils/hashes.py
@@ -5,7 +5,7 @@ import hashlib
 from pip._vendor.six import iteritems, iterkeys, itervalues
 
 from pip._internal.exceptions import (
-    HashMismatch, HashMissing, InstallationError
+    HashMismatch, HashMissing, InstallationError,
 )
 from pip._internal.utils.misc import read_chunks
 
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index d9ecbeb83..fa4c04727 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -29,7 +29,7 @@ from pip._internal.compat import console_to_str, expanduser, stdlib_pkgs
 from pip._internal.exceptions import InstallationError
 from pip._internal.locations import (
     running_under_virtualenv, site_packages, user_site, virtualenv_no_global,
-    write_delete_marker_file
+    write_delete_marker_file,
 )
 
 if PY2:
diff --git a/src/pip/_internal/utils/ui.py b/src/pip/_internal/utils/ui.py
index 3e1f0e7a0..8ade1e210 100644
--- a/src/pip/_internal/utils/ui.py
+++ b/src/pip/_internal/utils/ui.py
@@ -10,7 +10,7 @@ from signal import SIGINT, default_int_handler, signal
 from pip._vendor import six
 from pip._vendor.progress.bar import (
     Bar, ChargingBar, FillingCirclesBar, FillingSquaresBar, IncrementalBar,
-    ShadyBar
+    ShadyBar,
 )
 from pip._vendor.progress.helpers import HIDE_CURSOR, SHOW_CURSOR, WritelnMixin
 from pip._vendor.progress.spinner import Spinner
diff --git a/src/pip/_internal/wheel.py b/src/pip/_internal/wheel.py
index 31fc7b826..1df87db86 100644
--- a/src/pip/_internal/wheel.py
+++ b/src/pip/_internal/wheel.py
@@ -27,14 +27,14 @@ from pip._vendor.six import StringIO
 from pip._internal import pep425tags
 from pip._internal.download import path_to_url, unpack_url
 from pip._internal.exceptions import (
-    InstallationError, InvalidWheelFilename, UnsupportedWheel
+    InstallationError, InvalidWheelFilename, UnsupportedWheel,
 )
 from pip._internal.locations import (
-    PIP_DELETE_MARKER_FILENAME, distutils_scheme
+    PIP_DELETE_MARKER_FILENAME, distutils_scheme,
 )
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import (
-    call_subprocess, captured_stdout, ensure_dir, read_chunks
+    call_subprocess, captured_stdout, ensure_dir, read_chunks,
 )
 from pip._internal.utils.setuptools_build import SETUPTOOLS_SHIM
 from pip._internal.utils.temp_dir import TempDirectory
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
index 1846e7290..87c603818 100644
--- a/tests/functional/test_freeze.py
+++ b/tests/functional/test_freeze.py
@@ -8,7 +8,7 @@ import pytest
 
 from tests.lib import (
     _create_test_package, _create_test_package_with_srcdir, need_bzr,
-    need_mercurial
+    need_mercurial,
 )
 
 distribute_re = re.compile('^distribute==[0-9.]+\n', re.MULTILINE)
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 9f5474662..dc978b00e 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -13,7 +13,7 @@ from pip._internal.utils.misc import rmtree
 from tests.lib import (
     _create_svn_repo, _create_test_package, create_test_package_with_setup,
     need_bzr, need_mercurial, path_to_url, pyversion, pyversion_tuple,
-    requirements_file
+    requirements_file,
 )
 from tests.lib.local_repos import local_checkout
 from tests.lib.path import Path
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 40ffc5373..045409288 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -5,7 +5,7 @@ import pytest
 
 from tests.lib import (
     _create_test_package_with_subdirectory, path_to_url, pyversion,
-    requirements_file
+    requirements_file,
 )
 from tests.lib.local_repos import local_checkout
 
diff --git a/tests/functional/test_install_vcs.py b/tests/functional/test_install_vcs.py
index 4aa27a60b..9b3c4a1dd 100644
--- a/tests/functional/test_install_vcs.py
+++ b/tests/functional/test_install_vcs.py
@@ -1,7 +1,7 @@
 import pytest
 
 from tests.lib import (
-    _change_test_package_version, _create_test_package, pyversion
+    _change_test_package_version, _create_test_package, pyversion,
 )
 from tests.lib.local_repos import local_checkout
 
diff --git a/tests/functional/test_install_vcs_git.py b/tests/functional/test_install_vcs_git.py
index e119523e6..f9b5310ae 100644
--- a/tests/functional/test_install_vcs_git.py
+++ b/tests/functional/test_install_vcs_git.py
@@ -5,7 +5,7 @@ from pip._internal.vcs.git import Git
 from tests.lib import _create_test_package
 from tests.lib.git_submodule_helpers import (
     _change_test_package_submodule, _create_test_package_with_submodule,
-    _pull_in_submodule_changes_to_module
+    _pull_in_submodule_changes_to_module,
 )
 
 
diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py
index 18f7f97f3..1341a2524 100644
--- a/tests/functional/test_search.py
+++ b/tests/functional/test_search.py
@@ -1,7 +1,7 @@
 import pytest
 
 from pip._internal.commands.search import (
-    SearchCommand, highest_version, print_results, transform_hits
+    SearchCommand, highest_version, print_results, transform_hits,
 )
 from pip._internal.status_codes import NO_MATCHES_FOUND, SUCCESS
 from tests.lib import pyversion
diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
index 5200fa252..71d3d5762 100644
--- a/tests/unit/test_compat.py
+++ b/tests/unit/test_compat.py
@@ -5,7 +5,7 @@ import pytest
 
 import pip._internal.compat
 from pip._internal.compat import (
-    console_to_str, expanduser, get_path_uid, native_str
+    console_to_str, expanduser, get_path_uid, native_str,
 )
 
 
diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py
index 815b3c5e4..ef1ddf96a 100644
--- a/tests/unit/test_configuration.py
+++ b/tests/unit/test_configuration.py
@@ -8,7 +8,7 @@ from mock import MagicMock
 
 from pip._internal.exceptions import ConfigurationError
 from pip._internal.locations import (
-    new_config_file, site_config_files, venv_config_file
+    new_config_file, site_config_files, venv_config_file,
 )
 from tests.lib.configuration_helpers import ConfigurationMixin, kinds
 
diff --git a/tests/unit/test_download.py b/tests/unit/test_download.py
index 29be13968..bc6d14b60 100644
--- a/tests/unit/test_download.py
+++ b/tests/unit/test_download.py
@@ -11,7 +11,7 @@ from pip._vendor.six.moves.urllib import request as urllib_request
 import pip
 from pip._internal.download import (
     MultiDomainBasicAuth, PipSession, SafeFileCache, path_to_url,
-    unpack_file_url, unpack_http_url, url_to_path
+    unpack_file_url, unpack_http_url, url_to_path,
 )
 from pip._internal.exceptions import HashMismatch
 from pip._internal.index import Link
diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py
index c909518b2..5188e3eb2 100644
--- a/tests/unit/test_finder.py
+++ b/tests/unit/test_finder.py
@@ -8,10 +8,10 @@ import pip._internal.pep425tags
 import pip._internal.wheel
 from pip._internal.download import PipSession
 from pip._internal.exceptions import (
-    BestVersionAlreadyInstalled, DistributionNotFound
+    BestVersionAlreadyInstalled, DistributionNotFound,
 )
 from pip._internal.index import (
-    FormatControl, InstallationCandidate, Link, PackageFinder, fmt_ctl_formats
+    FormatControl, InstallationCandidate, Link, PackageFinder, fmt_ctl_formats,
 )
 from pip._internal.req import InstallRequirement
 
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index 1e4646cd5..9ef692730 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -12,7 +12,7 @@ from pip._vendor.packaging.requirements import Requirement
 from pip._internal.commands.install import InstallCommand
 from pip._internal.download import PipSession, path_to_url
 from pip._internal.exceptions import (
-    HashErrors, InstallationError, InvalidWheelFilename, PreviousBuildDirError
+    HashErrors, InstallationError, InvalidWheelFilename, PreviousBuildDirError,
 )
 from pip._internal.index import PackageFinder
 from pip._internal.operations.prepare import RequirementPreparer
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 8b83b641c..2f04c1599 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -9,12 +9,12 @@ from pretend import stub
 import pip._internal.index
 from pip._internal.download import PipSession
 from pip._internal.exceptions import (
-    InstallationError, RequirementsFileParseError
+    InstallationError, RequirementsFileParseError,
 )
 from pip._internal.index import PackageFinder
 from pip._internal.req.req_file import (
     break_args_options, ignore_comments, join_lines, parse_requirements,
-    preprocess, process_line, skip_regex
+    preprocess, process_line, skip_regex,
 )
 from pip._internal.req.req_install import InstallRequirement
 from tests.lib import requirements_file
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index af8176ba4..6756046a1 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -6,7 +6,7 @@ from mock import Mock
 import pip._internal.req.req_uninstall
 from pip._internal.req.req_uninstall import (
     UninstallPathSet, compact, compress_for_output_listing,
-    uninstallation_paths
+    uninstallation_paths,
 )
 from tests.lib import create_file
 
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index acfa6193a..cdd76ccfc 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -17,14 +17,14 @@ from mock import Mock, patch
 from pip._vendor.six import BytesIO
 
 from pip._internal.exceptions import (
-    HashMismatch, HashMissing, InstallationError, UnsupportedPythonVersion
+    HashMismatch, HashMissing, InstallationError, UnsupportedPythonVersion,
 )
 from pip._internal.utils.encoding import auto_decode
 from pip._internal.utils.glibc import check_glibc_version
 from pip._internal.utils.hashes import Hashes, MissingHashes
 from pip._internal.utils.misc import (
     egg_link_path, ensure_dir, get_installed_distributions, get_prog,
-    normalize_path, rmtree, untar_file, unzip_file
+    normalize_path, rmtree, untar_file, unzip_file,
 )
 from pip._internal.utils.packaging import check_dist_requires_python
 from pip._internal.utils.temp_dir import TempDirectory