Change isort multi_line_output to 3

上级 8582f7e4
......@@ -4,7 +4,7 @@ skip =
.scratch,
_vendor,
data
multi_line_output = 5
multi_line_output = 3
known_third_party =
pip._vendor
known_first_party =
......
......@@ -12,22 +12,30 @@ import traceback
from pip._internal.cli import cmdoptions
from pip._internal.cli.cmdoptions import make_search_scope
from pip._internal.cli.parser import (
ConfigOptionParser, UpdatingDefaultsHelpFormatter,
ConfigOptionParser,
UpdatingDefaultsHelpFormatter,
)
from pip._internal.cli.status_codes import (
ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR,
ERROR,
PREVIOUS_BUILD_DIR_ERROR,
SUCCESS,
UNKNOWN_ERROR,
VIRTUALENV_NOT_FOUND,
)
from pip._internal.download import PipSession
from pip._internal.exceptions import (
BadCommand, CommandError, InstallationError, PreviousBuildDirError,
BadCommand,
CommandError,
InstallationError,
PreviousBuildDirError,
UninstallationError,
)
from pip._internal.index import PackageFinder
from pip._internal.models.selection_prefs import SelectionPreferences
from pip._internal.models.target_python import TargetPython
from pip._internal.req.constructors import (
install_req_from_editable, install_req_from_line,
install_req_from_editable,
install_req_from_line,
)
from pip._internal.req.req_file import parse_requirements
from pip._internal.utils.deprecation import deprecated
......
......@@ -6,10 +6,13 @@ import sys
from pip._internal.cli import cmdoptions
from pip._internal.cli.parser import (
ConfigOptionParser, UpdatingDefaultsHelpFormatter,
ConfigOptionParser,
UpdatingDefaultsHelpFormatter,
)
from pip._internal.commands import (
commands_dict, get_similar_commands, get_summaries,
commands_dict,
get_similar_commands,
get_summaries,
)
from pip._internal.exceptions import CommandError
from pip._internal.utils.misc import get_pip_version, get_prog
......
......@@ -2,7 +2,8 @@ import logging
from pip._internal.cli.base_command import Command
from pip._internal.operations.check import (
check_package_set, create_package_set_from_installed,
check_package_set,
create_package_set_from_installed,
)
logger = logging.getLogger(__name__)
......
......@@ -5,7 +5,9 @@ import subprocess
from pip._internal.cli.base_command import Command
from pip._internal.cli.status_codes import ERROR, SUCCESS
from pip._internal.configuration import (
Configuration, get_configuration_files, kinds,
Configuration,
get_configuration_files,
kinds,
)
from pip._internal.exceptions import PipError
from pip._internal.utils.deprecation import deprecated
......
......@@ -15,7 +15,9 @@ from pip._internal.cli.base_command import RequirementCommand
from pip._internal.cli.cmdoptions import make_target_python
from pip._internal.cli.status_codes import ERROR
from pip._internal.exceptions import (
CommandError, InstallationError, PreviousBuildDirError,
CommandError,
InstallationError,
PreviousBuildDirError,
)
from pip._internal.legacy_resolve import Resolver
from pip._internal.locations import distutils_scheme
......@@ -25,7 +27,8 @@ from pip._internal.req import RequirementSet, install_given_reqs
from pip._internal.req.req_tracker import RequirementTracker
from pip._internal.utils.filesystem import check_path_owner
from pip._internal.utils.misc import (
ensure_dir, get_installed_version,
ensure_dir,
get_installed_version,
protect_pip_from_modification_on_windows,
)
from pip._internal.utils.temp_dir import TempDirectory
......
......@@ -13,7 +13,8 @@ from pip._internal.exceptions import CommandError
from pip._internal.index import PackageFinder
from pip._internal.models.selection_prefs import SelectionPreferences
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
......
......@@ -19,7 +19,8 @@ import sys
from pip._vendor.six.moves import configparser
from pip._internal.exceptions import (
ConfigurationError, ConfigurationFileCouldNotBeLoaded,
ConfigurationError,
ConfigurationFileCouldNotBeLoaded,
)
from pip._internal.utils import appdirs
from pip._internal.utils.compat import WINDOWS, expanduser
......
......@@ -36,10 +36,22 @@ from pip._internal.utils.filesystem import check_path_owner
from pip._internal.utils.glibc import libc_ver
from pip._internal.utils.marker_files import write_delete_marker_file
from pip._internal.utils.misc import (
ARCHIVE_EXTENSIONS, ask, ask_input, ask_password, ask_path_exists,
backup_dir, consume, display_path, format_size, get_installed_version,
path_to_url, remove_auth_from_url, rmtree, split_auth_netloc_from_url,
splitext, unpack_file,
ARCHIVE_EXTENSIONS,
ask,
ask_input,
ask_password,
ask_path_exists,
backup_dir,
consume,
display_path,
format_size,
get_installed_version,
path_to_url,
remove_auth_from_url,
rmtree,
split_auth_netloc_from_url,
splitext,
unpack_file,
)
from pip._internal.utils.temp_dir import TempDirectory
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -19,7 +19,9 @@ from pip._vendor.six.moves.urllib import request as urllib_request
from pip._internal.download import is_url, url_to_path
from pip._internal.exceptions import (
BestVersionAlreadyInstalled, DistributionNotFound, InvalidWheelFilename,
BestVersionAlreadyInstalled,
DistributionNotFound,
InvalidWheelFilename,
UnsupportedWheel,
)
from pip._internal.models.candidate import InstallationCandidate
......@@ -30,7 +32,10 @@ from pip._internal.models.target_python import TargetPython
from pip._internal.utils.compat import ipaddress
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import (
ARCHIVE_EXTENSIONS, SUPPORTED_EXTENSIONS, WHEEL_EXTENSION, path_to_url,
ARCHIVE_EXTENSIONS,
SUPPORTED_EXTENSIONS,
WHEEL_EXTENSION,
path_to_url,
redact_password_from_url,
)
from pip._internal.utils.packaging import check_requires_python
......
......@@ -18,16 +18,22 @@ from itertools import chain
from pip._vendor.packaging import specifiers
from pip._internal.exceptions import (
BestVersionAlreadyInstalled, DistributionNotFound, HashError, HashErrors,
BestVersionAlreadyInstalled,
DistributionNotFound,
HashError,
HashErrors,
UnsupportedPythonVersion,
)
from pip._internal.req.constructors import install_req_from_req_string
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import (
dist_in_usersite, ensure_dir, normalize_version_info,
dist_in_usersite,
ensure_dir,
normalize_version_info,
)
from pip._internal.utils.packaging import (
check_requires_python, get_requires_python,
check_requires_python,
get_requires_python,
)
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -4,8 +4,11 @@ import re
from pip._vendor.six.moves.urllib import parse as urllib_parse
from pip._internal.utils.misc import (
WHEEL_EXTENSION, path_to_url, redact_password_from_url,
split_auth_from_netloc, splitext,
WHEEL_EXTENSION,
path_to_url,
redact_password_from_url,
split_auth_from_netloc,
splitext,
)
from pip._internal.utils.models import KeyBasedCompareMixin
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -11,11 +11,13 @@ from pip._vendor.pkg_resources import RequirementParseError
from pip._internal.exceptions import BadCommand, InstallationError
from pip._internal.req.constructors import (
install_req_from_editable, install_req_from_line,
install_req_from_editable,
install_req_from_line,
)
from pip._internal.req.req_file import COMMENT_RE
from pip._internal.utils.misc import (
dist_is_editable, get_installed_distributions,
dist_is_editable,
get_installed_distributions,
)
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -11,11 +11,18 @@ from pip._internal.distributions import (
)
from pip._internal.distributions.installed import InstalledDistribution
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,
DirectoryUrlHashUnsupported,
HashUnpinned,
InstallationError,
PreviousBuildDirError,
VcsHashUnsupported,
)
from pip._internal.utils.compat import expanduser
from pip._internal.utils.hashes import MissingHashes
......
......@@ -18,7 +18,8 @@ from pip._internal.download import get_file_content
from pip._internal.exceptions import RequirementsFileParseError
from pip._internal.models.search_scope import SearchScope
from pip._internal.req.constructors import (
install_req_from_editable, install_req_from_line,
install_req_from_editable,
install_req_from_line,
)
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -26,9 +26,17 @@ from pip._internal.utils.hashes import Hashes
from pip._internal.utils.logging import indent_log
from pip._internal.utils.marker_files import PIP_DELETE_MARKER_FILENAME
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, redact_password_from_url, rmtree,
_make_build_dir,
ask_path_exists,
backup_dir,
call_subprocess,
display_path,
dist_in_site_packages,
dist_in_usersite,
ensure_dir,
get_installed_version,
redact_password_from_url,
rmtree,
)
from pip._internal.utils.packaging import get_metadata
from pip._internal.utils.setuptools_build import make_setuptools_shim_args
......
......@@ -14,8 +14,15 @@ from pip._internal.locations import bin_py, bin_user
from pip._internal.utils.compat import WINDOWS, cache_from_source, uses_pycache
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, rmtree,
FakeFile,
ask,
dist_in_usersite,
dist_is_local,
egg_link_path,
is_local,
normalize_path,
renames,
rmtree,
)
from pip._internal.utils.temp_dir import AdjacentTempDirectory, TempDirectory
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -5,7 +5,9 @@ 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
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -32,12 +32,17 @@ from pip import __version__
from pip._internal.exceptions import CommandError, InstallationError
from pip._internal.locations import site_packages, user_site
from pip._internal.utils.compat import (
WINDOWS, console_to_str, expanduser, stdlib_pkgs, str_to_display,
WINDOWS,
console_to_str,
expanduser,
stdlib_pkgs,
str_to_display,
)
from pip._internal.utils.marker_files import write_delete_marker_file
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
from pip._internal.utils.virtualenv import (
running_under_virtualenv, virtualenv_no_global,
running_under_virtualenv,
virtualenv_no_global,
)
if PY2:
......
......@@ -13,7 +13,9 @@ from pip._internal.utils.compat import samefile
from pip._internal.utils.misc import display_path, redact_password_from_url
from pip._internal.utils.temp_dir import TempDirectory
from pip._internal.vcs.versioncontrol import (
RemoteNotFoundError, VersionControl, vcs,
RemoteNotFoundError,
VersionControl,
vcs,
)
urlsplit = urllib_parse.urlsplit
......
......@@ -7,7 +7,9 @@ import sys
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import (
display_path, rmtree, split_auth_from_netloc,
display_path,
rmtree,
split_auth_from_netloc,
)
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
from pip._internal.vcs.versioncontrol import VersionControl, vcs
......
......@@ -12,7 +12,11 @@ from pip._vendor.six.moves.urllib import parse as urllib_parse
from pip._internal.exceptions import BadCommand
from pip._internal.utils.misc import (
ask_path_exists, backup_dir, call_subprocess, display_path, rmtree,
ask_path_exists,
backup_dir,
call_subprocess,
display_path,
rmtree,
)
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
......
......@@ -25,15 +25,22 @@ from pip._vendor.six import StringIO
from pip._internal import pep425tags
from pip._internal.download import unpack_url
from pip._internal.exceptions import (
InstallationError, InvalidWheelFilename, UnsupportedWheel,
InstallationError,
InvalidWheelFilename,
UnsupportedWheel,
)
from pip._internal.locations import distutils_scheme
from pip._internal.models.link import Link
from pip._internal.utils.logging import indent_log
from pip._internal.utils.marker_files import PIP_DELETE_MARKER_FILENAME
from pip._internal.utils.misc import (
LOG_DIVIDER, call_subprocess, captured_stdout, ensure_dir,
format_command_args, path_to_url, read_chunks,
LOG_DIVIDER,
call_subprocess,
captured_stdout,
ensure_dir,
format_command_args,
path_to_url,
read_chunks,
)
from pip._internal.utils.setuptools_build import make_setuptools_shim_args
from pip._internal.utils.temp_dir import TempDirectory
......
......@@ -7,8 +7,12 @@ from doctest import ELLIPSIS, OutputChecker
import pytest
from tests.lib import (
_create_test_package, _create_test_package_with_srcdir, _git_commit,
need_bzr, need_mercurial, path_to_url,
_create_test_package,
_create_test_package_with_srcdir,
_git_commit,
need_bzr,
need_mercurial,
path_to_url,
)
distribute_re = re.compile('^distribute==[0-9.]+\n', re.MULTILINE)
......
......@@ -12,9 +12,16 @@ from pip._internal.cli.status_codes import ERROR, SUCCESS
from pip._internal.models.index import PyPI, TestPyPI
from pip._internal.utils.misc import rmtree
from tests.lib import (
_create_svn_repo, _create_test_package, create_basic_wheel_for_package,
create_test_package_with_setup, need_bzr, need_mercurial, path_to_url,
pyversion, pyversion_tuple, requirements_file,
_create_svn_repo,
_create_test_package,
create_basic_wheel_for_package,
create_test_package_with_setup,
need_bzr,
need_mercurial,
path_to_url,
pyversion,
pyversion_tuple,
requirements_file,
)
from tests.lib.local_repos import local_checkout
from tests.lib.path import Path
......
......@@ -4,7 +4,9 @@ import textwrap
import pytest
from tests.lib import (
_create_test_package_with_subdirectory, path_to_url, pyversion,
_create_test_package_with_subdirectory,
path_to_url,
pyversion,
requirements_file,
)
from tests.lib.local_repos import local_checkout
......
import pytest
from tests.lib import (
_change_test_package_version, _create_test_package, _test_path_to_file_url,
_change_test_package_version,
_create_test_package,
_test_path_to_file_url,
pyversion,
)
from tests.lib.git_submodule_helpers import (
_change_test_package_submodule, _create_test_package_with_submodule,
_change_test_package_submodule,
_create_test_package_with_submodule,
_pull_in_submodule_changes_to_module,
)
from tests.lib.local_repos import local_checkout
......
......@@ -5,7 +5,10 @@ import pytest
from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS
from pip._internal.commands.search import (
SearchCommand, highest_version, print_results, transform_hits,
SearchCommand,
highest_version,
print_results,
transform_hits,
)
from tests.lib import pyversion
......
......@@ -8,7 +8,11 @@ import pytest
from pip._internal.vcs.bazaar import Bazaar
from tests.lib import (
_test_path_to_file_url, _vcs_add, create_file, is_bzr_installed, need_bzr,
_test_path_to_file_url,
_vcs_add,
create_file,
is_bzr_installed,
need_bzr,
)
......
......@@ -2,7 +2,8 @@ import pretend
import pytest
from pip._internal.cli.cmdoptions import (
_convert_python_version, make_search_scope,
_convert_python_version,
make_search_scope,
)
......
......@@ -7,7 +7,11 @@ import pytest
import pip._internal.utils.compat as pip_compat
from pip._internal.utils.compat import (
console_to_str, expanduser, get_path_uid, native_str, str_to_display,
console_to_str,
expanduser,
get_path_uid,
native_str,
str_to_display,
)
......
......@@ -11,9 +11,16 @@ from mock import Mock, patch
import pip
from pip._internal.download import (
CI_ENVIRONMENT_VARIABLES, MultiDomainBasicAuth, PipSession, SafeFileCache,
_download_http_url, parse_content_disposition, sanitize_content_filename,
unpack_file_url, unpack_http_url, url_to_path,
CI_ENVIRONMENT_VARIABLES,
MultiDomainBasicAuth,
PipSession,
SafeFileCache,
_download_http_url,
parse_content_disposition,
sanitize_content_filename,
unpack_file_url,
unpack_http_url,
url_to_path,
)
from pip._internal.exceptions import HashMismatch
from pip._internal.models.link import Link
......
......@@ -9,10 +9,14 @@ from pkg_resources import parse_version
import pip._internal.pep425tags
import pip._internal.wheel
from pip._internal.exceptions import (
BestVersionAlreadyInstalled, DistributionNotFound,
BestVersionAlreadyInstalled,
DistributionNotFound,
)
from pip._internal.index import (
CandidateEvaluator, InstallationCandidate, Link, LinkEvaluator,
CandidateEvaluator,
InstallationCandidate,
Link,
LinkEvaluator,
)
from pip._internal.models.target_python import TargetPython
from pip._internal.req.constructors import install_req_from_line
......
......@@ -8,10 +8,20 @@ from pip._vendor.packaging.specifiers import SpecifierSet
from pip._internal.download import PipSession
from pip._internal.index import (
CandidateEvaluator, CandidatePreferences, FormatControl, HTMLPage, Link,
LinkEvaluator, PackageFinder, _check_link_requires_python, _clean_link,
_determine_base_url, _extract_version_from_fragment,
_find_name_version_sep, _get_html_page, filter_unallowed_hashes,
CandidateEvaluator,
CandidatePreferences,
FormatControl,
HTMLPage,
Link,
LinkEvaluator,
PackageFinder,
_check_link_requires_python,
_clean_link,
_determine_base_url,
_extract_version_from_fragment,
_find_name_version_sep,
_get_html_page,
filter_unallowed_hashes,
)
from pip._internal.models.candidate import InstallationCandidate
from pip._internal.models.search_scope import SearchScope
......
......@@ -6,7 +6,11 @@ from pip._vendor.six.moves.urllib import request as urllib_request
from pip._internal.download import PipSession
from pip._internal.index import (
Link, _get_html_page, _get_html_response, _NotHTML, _NotHTTP,
Link,
_get_html_page,
_get_html_response,
_NotHTML,
_NotHTTP,
)
......
......@@ -4,7 +4,8 @@ import pytest
from pip._vendor import pkg_resources
from pip._internal.exceptions import (
NoneMetadataError, UnsupportedPythonVersion,
NoneMetadataError,
UnsupportedPythonVersion,
)
from pip._internal.legacy_resolve import _check_dist_requires_python
from pip._internal.utils.packaging import get_requires_python
......
......@@ -8,7 +8,9 @@ from mock import patch
from pip._vendor.six import PY2
from pip._internal.utils.logging import (
BrokenStdoutLoggingError, ColorizedStreamHandler, IndentingFormatter,
BrokenStdoutLoggingError,
ColorizedStreamHandler,
IndentingFormatter,
)
from pip._internal.utils.misc import captured_stderr, captured_stdout
......
......@@ -12,19 +12,27 @@ from pip._vendor.packaging.requirements import Requirement
from pip._internal.commands.install import InstallCommand
from pip._internal.download import PipSession
from pip._internal.exceptions import (
HashErrors, InstallationError, InvalidWheelFilename, PreviousBuildDirError,
HashErrors,
InstallationError,
InvalidWheelFilename,
PreviousBuildDirError,
)
from pip._internal.legacy_resolve import Resolver
from pip._internal.operations.prepare import RequirementPreparer
from pip._internal.req import InstallRequirement, RequirementSet
from pip._internal.req.constructors import (
install_req_from_editable, install_req_from_line, parse_editable,
install_req_from_editable,
install_req_from_line,
parse_editable,
)
from pip._internal.req.req_file import process_line
from pip._internal.req.req_tracker import RequirementTracker
from pip._internal.utils.misc import path_to_url
from tests.lib import (
DATA_DIR, assert_raises_regexp, make_test_finder, requirements_file,
DATA_DIR,
assert_raises_regexp,
make_test_finder,
requirements_file,
)
......
......@@ -10,15 +10,22 @@ 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.models.format_control import FormatControl
from pip._internal.req.constructors import (
install_req_from_editable, install_req_from_line,
install_req_from_editable,
install_req_from_line,
)
from pip._internal.req.req_file import (
break_args_options, ignore_comments, join_lines, parse_requirements,
preprocess, process_line, skip_regex,
break_args_options,
ignore_comments,
join_lines,
parse_requirements,
preprocess,
process_line,
skip_regex,
)
from tests.lib import make_test_finder, requirements_file
......
......@@ -6,7 +6,8 @@ from pip._vendor.packaging.requirements import Requirement
from pip._internal.exceptions import InstallationError
from pip._internal.req.constructors import (
install_req_from_line, install_req_from_req_string,
install_req_from_line,
install_req_from_req_string,
)
from pip._internal.req.req_install import InstallRequirement
......
......@@ -5,8 +5,12 @@ from mock import Mock
import pip._internal.req.req_uninstall
from pip._internal.req.req_uninstall import (
StashedUninstallPathSet, UninstallPathSet, compact,
compress_for_output_listing, compress_for_rename, uninstallation_paths,
StashedUninstallPathSet,
UninstallPathSet,
compact,
compress_for_output_listing,
compress_for_rename,
uninstallation_paths,
)
from tests.lib import create_file
......
......@@ -23,21 +23,39 @@ from mock import Mock, patch
from pip._vendor.six.moves.urllib import request as urllib_request
from pip._internal.exceptions import (
HashMismatch, HashMissing, InstallationError,
HashMismatch,
HashMissing,
InstallationError,
)
from pip._internal.utils.deprecation import PipDeprecationWarning, deprecated
from pip._internal.utils.encoding import BOMS, auto_decode
from pip._internal.utils.glibc import (
check_glibc_version, glibc_version_string, glibc_version_string_confstr,
check_glibc_version,
glibc_version_string,
glibc_version_string_confstr,
glibc_version_string_ctypes,
)
from pip._internal.utils.hashes import Hashes, MissingHashes
from pip._internal.utils.misc import (
call_subprocess, egg_link_path, ensure_dir, format_command_args,
get_installed_distributions, get_prog, make_subprocess_output_error,
normalize_path, normalize_version_info, path_to_display, path_to_url,
redact_netloc, redact_password_from_url, remove_auth_from_url, rmtree,
split_auth_from_netloc, split_auth_netloc_from_url, untar_file, unzip_file,
call_subprocess,
egg_link_path,
ensure_dir,
format_command_args,
get_installed_distributions,
get_prog,
make_subprocess_output_error,
normalize_path,
normalize_version_info,
path_to_display,
path_to_url,
redact_netloc,
redact_password_from_url,
remove_auth_from_url,
rmtree,
split_auth_from_netloc,
split_auth_netloc_from_url,
untar_file,
unzip_file,
)
from pip._internal.utils.setuptools_build import make_setuptools_shim_args
from pip._internal.utils.temp_dir import AdjacentTempDirectory, TempDirectory
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册