(merge 3.2) Close #12383: Fix subprocess module with env={}: don't copy the
environment variables, start with an empty environment.
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 49137d4..cfd4c85 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1250,7 +1250,7 @@
# potential deadlocks, thus we do all this here.
# and pass it to fork_exec()
- if env:
+ if env is not None:
env_list = [os.fsencode(k) + b'=' + os.fsencode(v)
for k, v in env.items()]
else:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index b52d8e8..b871359 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -382,13 +382,22 @@
def test_env(self):
newenv = os.environ.copy()
newenv["FRUIT"] = "orange"
- p = subprocess.Popen([sys.executable, "-c",
- 'import sys,os;'
- 'sys.stdout.write(os.getenv("FRUIT"))'],
- stdout=subprocess.PIPE,
- env=newenv)
- self.addCleanup(p.stdout.close)
- self.assertEqual(p.stdout.read(), b"orange")
+ with subprocess.Popen([sys.executable, "-c",
+ 'import sys,os;'
+ 'sys.stdout.write(os.getenv("FRUIT"))'],
+ stdout=subprocess.PIPE,
+ env=newenv) as p:
+ stdout, stderr = p.communicate()
+ self.assertEqual(stdout, b"orange")
+
+ def test_empty_env(self):
+ with subprocess.Popen([sys.executable, "-c",
+ 'import os; '
+ 'print(len(os.environ))'],
+ stdout=subprocess.PIPE,
+ env={}) as p:
+ stdout, stderr = p.communicate()
+ self.assertEqual(stdout.strip(), b"0")
def test_communicate_stdin(self):
p = subprocess.Popen([sys.executable, "-c",
diff --git a/Misc/NEWS b/Misc/NEWS
index a793d08..272141f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -196,6 +196,9 @@
Library
-------
+- Issue #12383: Fix subprocess module with env={}: don't copy the environment
+ variables, start with an empty environment.
+
- Issue #11637: Fix support for importing packaging setup hooks from the
project directory.