gh-90355: Add isolated flag if currently isolated (GH-92857)

kcdodd · merwok · ambv · web-flow · commit c8556bcf6c0b · 2022-07-05T17:23:44.000+02:00
Co-authored-by: Éric &lt;merwok@netwok.org&gt;
Co-authored-by: Łukasz Langa &lt;lukasz@langa.pl&gt;
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
@@ -89,8 +89,18 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, '-W', 'ignore::DeprecationWarning',
-                           "-c", code], check=True).returncode
+
+    cmd = [
+        sys.executable,
+        '-W',
+        'ignore::DeprecationWarning',
+        '-c',
+        code,
+    ]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.