From c8556bcf6c0b05ac46bd74880626a2853e7c99a1 Mon Sep 17 00:00:00 2001
From: Carter Dodd <carter.dodd@gmail.com>
Date: Tue, 5 Jul 2022 10:23:44 -0500
Subject: [PATCH] gh-90355: Add isolated flag if currently isolated (GH-92857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Éric <merwok@netwok.org>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
---
Lib/ensurepip/__init__.py | 14 ++++++++++++--
.../2022-01-03-15-07-06.bpo-46197.Z0djv6.rst | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a198a86e1f9..1f25825f3fe 100644
--- 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
new file mode 100644
index 00000000000..7a3b2d59dfa
--- /dev/null
+++ 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``.
--
GitLab