summaryrefslogtreecommitdiffstats
path: root/Lib/ensurepip/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/ensurepip/__init__.py')
-rw-r--r--Lib/ensurepip/__init__.py31
1 files changed, 14 insertions, 17 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 21320a8..cb2882e 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -3,6 +3,7 @@ import os.path
import sys
import runpy
import tempfile
+import subprocess
from importlib import resources
from . import _bundled
@@ -14,7 +15,7 @@ __all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "47.1.0"
-_PIP_VERSION = "20.1.1"
+_PIP_VERSION = "20.2.3"
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
@@ -23,22 +24,18 @@ _PROJECTS = [
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():