Skip to content

Commit 2e51624

Browse files
authored
Merge pull request #6764 from pradyunsg/style/isort
Change isort multi_line_output to 3
2 parents 4a7b345 + 537b0fc commit 2e51624

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+271
-85
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ skip =
44
.scratch,
55
_vendor,
66
data
7-
multi_line_output = 5
7+
multi_line_output = 3
88
known_third_party =
99
pip._vendor
1010
known_first_party =

src/pip/_internal/cli/base_command.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,30 @@
1212
from pip._internal.cli import cmdoptions
1313
from pip._internal.cli.cmdoptions import make_search_scope
1414
from pip._internal.cli.parser import (
15-
ConfigOptionParser, UpdatingDefaultsHelpFormatter,
15+
ConfigOptionParser,
16+
UpdatingDefaultsHelpFormatter,
1617
)
1718
from pip._internal.cli.status_codes import (
18-
ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR,
19+
ERROR,
20+
PREVIOUS_BUILD_DIR_ERROR,
21+
SUCCESS,
22+
UNKNOWN_ERROR,
1923
VIRTUALENV_NOT_FOUND,
2024
)
2125
from pip._internal.download import PipSession
2226
from pip._internal.exceptions import (
23-
BadCommand, CommandError, InstallationError, PreviousBuildDirError,
27+
BadCommand,
28+
CommandError,
29+
InstallationError,
30+
PreviousBuildDirError,
2431
UninstallationError,
2532
)
2633
from pip._internal.index import PackageFinder
2734
from pip._internal.models.selection_prefs import SelectionPreferences
2835
from pip._internal.models.target_python import TargetPython
2936
from pip._internal.req.constructors import (
30-
install_req_from_editable, install_req_from_line,
37+
install_req_from_editable,
38+
install_req_from_line,
3139
)
3240
from pip._internal.req.req_file import parse_requirements
3341
from pip._internal.utils.deprecation import deprecated

src/pip/_internal/cli/main_parser.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66

77
from pip._internal.cli import cmdoptions
88
from pip._internal.cli.parser import (
9-
ConfigOptionParser, UpdatingDefaultsHelpFormatter,
9+
ConfigOptionParser,
10+
UpdatingDefaultsHelpFormatter,
1011
)
1112
from pip._internal.commands import (
12-
commands_dict, get_similar_commands, get_summaries,
13+
commands_dict,
14+
get_similar_commands,
15+
get_summaries,
1316
)
1417
from pip._internal.exceptions import CommandError
1518
from pip._internal.utils.misc import get_pip_version, get_prog

src/pip/_internal/commands/check.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from pip._internal.cli.base_command import Command
44
from pip._internal.operations.check import (
5-
check_package_set, create_package_set_from_installed,
5+
check_package_set,
6+
create_package_set_from_installed,
67
)
78

89
logger = logging.getLogger(__name__)

src/pip/_internal/commands/configuration.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
from pip._internal.cli.base_command import Command
66
from pip._internal.cli.status_codes import ERROR, SUCCESS
77
from pip._internal.configuration import (
8-
Configuration, get_configuration_files, kinds,
8+
Configuration,
9+
get_configuration_files,
10+
kinds,
911
)
1012
from pip._internal.exceptions import PipError
1113
from pip._internal.utils.deprecation import deprecated

src/pip/_internal/commands/install.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
from pip._internal.cli.cmdoptions import make_target_python
1616
from pip._internal.cli.status_codes import ERROR
1717
from pip._internal.exceptions import (
18-
CommandError, InstallationError, PreviousBuildDirError,
18+
CommandError,
19+
InstallationError,
20+
PreviousBuildDirError,
1921
)
2022
from pip._internal.legacy_resolve import Resolver
2123
from pip._internal.locations import distutils_scheme
@@ -25,7 +27,8 @@
2527
from pip._internal.req.req_tracker import RequirementTracker
2628
from pip._internal.utils.filesystem import check_path_owner
2729
from pip._internal.utils.misc import (
28-
ensure_dir, get_installed_version,
30+
ensure_dir,
31+
get_installed_version,
2932
protect_pip_from_modification_on_windows,
3033
)
3134
from pip._internal.utils.temp_dir import TempDirectory

src/pip/_internal/commands/list.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from pip._internal.index import PackageFinder
1414
from pip._internal.models.selection_prefs import SelectionPreferences
1515
from pip._internal.utils.misc import (
16-
dist_is_editable, get_installed_distributions,
16+
dist_is_editable,
17+
get_installed_distributions,
1718
)
1819
from pip._internal.utils.packaging import get_installer
1920

src/pip/_internal/configuration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
from pip._vendor.six.moves import configparser
2020

2121
from pip._internal.exceptions import (
22-
ConfigurationError, ConfigurationFileCouldNotBeLoaded,
22+
ConfigurationError,
23+
ConfigurationFileCouldNotBeLoaded,
2324
)
2425
from pip._internal.utils import appdirs
2526
from pip._internal.utils.compat import WINDOWS, expanduser

src/pip/_internal/download.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,22 @@
3636
from pip._internal.utils.glibc import libc_ver
3737
from pip._internal.utils.marker_files import write_delete_marker_file
3838
from pip._internal.utils.misc import (
39-
ARCHIVE_EXTENSIONS, ask, ask_input, ask_password, ask_path_exists,
40-
backup_dir, consume, display_path, format_size, get_installed_version,
41-
path_to_url, remove_auth_from_url, rmtree, split_auth_netloc_from_url,
42-
splitext, unpack_file,
39+
ARCHIVE_EXTENSIONS,
40+
ask,
41+
ask_input,
42+
ask_password,
43+
ask_path_exists,
44+
backup_dir,
45+
consume,
46+
display_path,
47+
format_size,
48+
get_installed_version,
49+
path_to_url,
50+
remove_auth_from_url,
51+
rmtree,
52+
split_auth_netloc_from_url,
53+
splitext,
54+
unpack_file,
4355
)
4456
from pip._internal.utils.temp_dir import TempDirectory
4557
from pip._internal.utils.typing import MYPY_CHECK_RUNNING

src/pip/_internal/index.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020
from pip._internal.download import is_url, url_to_path
2121
from pip._internal.exceptions import (
22-
BestVersionAlreadyInstalled, DistributionNotFound, InvalidWheelFilename,
22+
BestVersionAlreadyInstalled,
23+
DistributionNotFound,
24+
InvalidWheelFilename,
2325
UnsupportedWheel,
2426
)
2527
from pip._internal.models.candidate import InstallationCandidate
@@ -30,7 +32,10 @@
3032
from pip._internal.utils.compat import ipaddress
3133
from pip._internal.utils.logging import indent_log
3234
from pip._internal.utils.misc import (
33-
ARCHIVE_EXTENSIONS, SUPPORTED_EXTENSIONS, WHEEL_EXTENSION, path_to_url,
35+
ARCHIVE_EXTENSIONS,
36+
SUPPORTED_EXTENSIONS,
37+
WHEEL_EXTENSION,
38+
path_to_url,
3439
redact_password_from_url,
3540
)
3641
from pip._internal.utils.packaging import check_requires_python

0 commit comments

Comments
 (0)