summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-12-01 08:12:24 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-12-01 08:12:24 (GMT)
commit361e30c17a7973874334597903afb3ba5a477f49 (patch)
treea1b01b9f99a3705ae3d949fb683c234c62f317cc /Lib/subprocess.py
parent1eda9e7c3074bfe37674c8140b3d02bf94caf4f3 (diff)
downloadcpython-361e30c17a7973874334597903afb3ba5a477f49.zip
cpython-361e30c17a7973874334597903afb3ba5a477f49.tar.gz
cpython-361e30c17a7973874334597903afb3ba5a477f49.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 a659087..c3a2788 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1368,10 +1368,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,