Close #20757: return success for skipped pip uninstall

ncoghlan · ncoghlan · commit 4a6dc3a72646 · 2014-02-28T23:35:05.000+10:00
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.
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
@@ -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()
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
@@ -196,10 +196,12 @@ def test_uninstall_skipped_when_not_installed(self):
             ensurepip._uninstall_helper()
         self.run_pip.assert_not_called()
 
-    def test_uninstall_fails_with_wrong_version(self):
+    def test_uninstall_skipped_with_warning_for_wrong_version(self):
         with fake_pip("not a valid version"):
-            with self.assertRaises(RuntimeError):
+            with test.support.captured_stderr() as stderr:
                 ensurepip._uninstall_helper()
+        warning = stderr.getvalue().strip()
+        self.assertIn("only uninstall a matching version", warning)
         self.run_pip.assert_not_called()
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -31,6 +31,13 @@ Tests
 
 - Issue #20743: Fix a reference leak in test_tcl.
 
+Build
+-----
+
+- Issue #20757: The ensurepip helper for the Windows uninstaller now skips
+  uninstalling pip (rather than failing) if the user has updated pip to a
+  different version from the one bundled with ensurepip.
+
 Tools/Demos
 -----------
 
