Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge the fix for #24267

This commit is contained in:
Donald Stufft 2015-06-02 10:38:21 -04:00
parent ec6cd162de 67872ba91a
commit 75124e08c5
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/ensurepip/__init__.py
View File

@ -137,7 +137,7 @@ def _uninstall_helper(*, verbosity=0):
_disable_pip_configuration_settings()
# Construct the arguments to be passed to the pip command
args = ["uninstall", "-y"]
args = ["uninstall", "-y", "--disable-pip-version-check"]
if verbosity:
args += ["-" + "v" * verbosity]

25
Lib/test/test_ensurepip.py
View File

@ -211,7 +211,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper()
self.run_pip.assert_called_once_with(
["uninstall", "-y", "pip", "setuptools"]
[
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
]
)
@requires_usable_pip
@ -220,7 +223,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=1)
self.run_pip.assert_called_once_with(
["uninstall", "-y", "-v", "pip", "setuptools"]
[
"uninstall", "-y", "--disable-pip-version-check", "-v", "pip",
"setuptools",
]
)
@requires_usable_pip
@ -229,7 +235,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=2)
self.run_pip.assert_called_once_with(
["uninstall", "-y", "-vv", "pip", "setuptools"]
[
"uninstall", "-y", "--disable-pip-version-check", "-vv", "pip",
"setuptools",
]
)
@requires_usable_pip
@ -238,7 +247,10 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper(verbosity=3)
self.run_pip.assert_called_once_with(
["uninstall", "-y", "-vvv", "pip", "setuptools"]
[
"uninstall", "-y", "--disable-pip-version-check", "-vvv",
"pip", "setuptools",
]
)
@requires_usable_pip
@ -336,7 +348,10 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall._main([])
self.run_pip.assert_called_once_with(
["uninstall", "-y", "pip", "setuptools"]
[
"uninstall", "-y", "--disable-pip-version-check", "pip",
"setuptools",
]
)