[Python-checkins] [3.9] bpo-41490: Bump vendored pip to version 20.2.3 (GH-22527). (GH-22544)

Sun Oct 4 13:11:14 EDT 2020

https://github.com/python/cpython/commit/4b4d60f9287e0e52c2569876456f40efc11529b4
commit: 4b4d60f9287e0e52c2569876456f40efc11529b4
branch: 3.9
author: Pablo Galindo <Pablogsal at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020年10月04日T19:11:10+02:00
summary:
[3.9] bpo-41490: Bump vendored pip to version 20.2.3 (GH-22527). (GH-22544)
(cherry picked from commit 2cc6dc9896771ef3615abbb5ba80939a2f644a08)
Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>
files:
A Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 8f504e7f49b37..97dfa7ea71f8f 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -3,6 +3,7 @@
 import sys
 import runpy
 import tempfile
+import subprocess
 from importlib import resources
 
 from . import _bundled
@@ -14,7 +15,7 @@
 
 _SETUPTOOLS_VERSION = "49.2.1"
 
-_PIP_VERSION = "20.2.1"
+_PIP_VERSION = "20.2.3"
 
 _PROJECTS = [
 ("setuptools", _SETUPTOOLS_VERSION, "py3"),
@@ -23,22 +24,18 @@
 
 
 def _run_pip(args, additional_paths=None):
- # Add our bundled software to the sys.path so we can import it
- if additional_paths is not None:
- sys.path = additional_paths + sys.path
-
- # Invoke pip as if it's the main module, and catch the exit.
- backup_argv = sys.argv[:]
- sys.argv[1:] = args
- try:
- # run_module() alters sys.modules and sys.argv, but restores them at exit
- runpy.run_module("pip", run_name="__main__", alter_sys=True)
- except SystemExit as exc:
- return exc.code
- finally:
- sys.argv[:] = backup_argv
-
- raise SystemError("pip did not exit, this should never happen")
+ # Run the bootstraping in a subprocess to avoid leaking any state that happens
+ # after pip has executed. Particulary, this avoids the case when pip holds onto
+ # the files in *additional_paths*, preventing us to remove them at the end of the
+ # invocation.
+ code = f"""
+import runpy
+import sys
+sys.path = {additional_paths or []} + sys.path
+sys.argv[1:] = {args}
+runpy.run_module("pip", run_name="__main__", alter_sys=True)
+"""
+ return subprocess.run([sys.executable, "-c", code], check=True).returncode
 
 
 def version():
diff --git a/Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl
new file mode 100644
index 0000000000000..7ebdc0f31d4e3
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl differ
