Skip to content

Commit 9117ccc

Browse files
committed
Refactor out a get_pip_version() function into misc.py.
1 parent a38a0ea commit 9117ccc

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/pip/_internal/cli/main_parser.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import os
55
import sys
66

7-
from pip import __version__
87
from pip._internal.cli import cmdoptions
98
from pip._internal.cli.parser import (
109
ConfigOptionParser, UpdatingDefaultsHelpFormatter,
@@ -13,7 +12,7 @@
1312
commands_dict, get_similar_commands, get_summaries,
1413
)
1514
from pip._internal.exceptions import CommandError
16-
from pip._internal.utils.misc import get_prog
15+
from pip._internal.utils.misc import get_pip_version, get_prog
1716
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
1817

1918
if MYPY_CHECK_RUNNING:
@@ -39,12 +38,7 @@ def create_main_parser():
3938
parser = ConfigOptionParser(**parser_kw)
4039
parser.disable_interspersed_args()
4140

42-
pip_pkg_dir = os.path.abspath(os.path.join(
43-
os.path.dirname(__file__), "..", "..",
44-
))
45-
parser.version = 'pip %s from %s (python %s)' % (
46-
__version__, pip_pkg_dir, sys.version[:3],
47-
)
41+
parser.version = get_pip_version()
4842

4943
# add the general options
5044
gen_opts = cmdoptions.make_option_group(cmdoptions.general_group, parser)

src/pip/_internal/utils/misc.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
from pip._vendor.six.moves.urllib import request as urllib_request
2929
from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote
3030

31+
from pip import __version__
3132
from pip._internal.exceptions import CommandError, InstallationError
3233
from pip._internal.locations import (
3334
running_under_virtualenv, site_packages, user_site, virtualenv_no_global,
@@ -104,6 +105,18 @@ def cast(typ, val):
104105
logger.debug('lzma module is not available')
105106

106107

108+
def get_pip_version():
109+
# type: () -> str
110+
pip_pkg_dir = os.path.join(os.path.dirname(__file__), "..", "..")
111+
pip_pkg_dir = os.path.abspath(pip_pkg_dir)
112+
113+
return (
114+
'pip {} from {} (python {})'.format(
115+
__version__, pip_pkg_dir, sys.version[:3],
116+
)
117+
)
118+
119+
107120
def normalize_version_info(py_version_info):
108121
# type: (Optional[Tuple[int, ...]]) -> Optional[Tuple[int, int, int]]
109122
"""

0 commit comments

Comments
 (0)