summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-12-01 08:13:35 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-12-01 08:13:35 (GMT)
commit54532c9742523814bbc43ccbd1a4560ec3d449d3 (patch)
tree9a56def10252b7ab1e154db3f23c64a0aa5481f3 /Lib/subprocess.py
parent1c27e3c7fbf8ee33e20677558e7e394a1bdb70d0 (diff)
parent361e30c17a7973874334597903afb3ba5a477f49 (diff)
downloadcpython-54532c9742523814bbc43ccbd1a4560ec3d449d3.zip
cpython-54532c9742523814bbc43ccbd1a4560ec3d449d3.tar.gz
cpython-54532c9742523814bbc43ccbd1a4560ec3d449d3.tar.bz2
Undo supposed fix for Issue #15798 until I understand why this is
causing test_multiprocessing_forkserver and test_multiprocessing_spawn failures on head (3.4).
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index f717c82..88355ad 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1361,10 +1361,7 @@ class Popen(object):
executable_list = tuple(
os.path.join(os.fsencode(dir), executable)
for dir in os.get_exec_path(env))
- # Never close stdin, stdout and stderr for the child.
- fds_to_keep = {0,1,2}
- fds_to_keep.update(pass_fds)
- # Our child uses this one to signal error before exec().
+ fds_to_keep = set(pass_fds)
fds_to_keep.add(errpipe_write)
self.pid = _posixsubprocess.fork_exec(
args, executable_list,