mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Close #20757: return success for skipped pip uninstall

Browse source 
The 3.4rc2 Windows uninstaller would fail if pip had been updated
to a version that didn't match the version installed by ensurepip.
This skip is no longer treated as an error, so an updated pip ends
up being handled like any other pip installed package and is left
alone by the CPython uninstaller.
This commit is contained in:
Nick Coghlan 2014-02-28 23:35:05 +10:00
parent 78c330d714
commit 4a6dc3a726
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/ensurepip/__init__.py
View file

@ -128,9 +128,10 @@ def _uninstall_helper(*, verbosity=0):
# If the pip version doesn't match the bundled one, leave it alone
if pip.__version__ != _PIP_VERSION:
msg = ("ensurepip will only uninstall a matching pip "
msg = ("ensurepip will only uninstall a matching version "
"({!r} installed, {!r} bundled)")
raise RuntimeError(msg.format(pip.__version__, _PIP_VERSION))
print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr)
return
_require_ssl_for_pip()
_disable_pip_configuration_settings()