diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-06 03:58:59 (GMT) |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-06 03:58:59 (GMT) |
commit | f3ce2ab2f1fc5234aad3e47c82a3e24301d8ef10 (patch) | |
tree | 1f19a904d6fa59ecbe4b3d6de0a5dd23ee18ef4d /Lib/subprocess.py | |
parent | 63d675ce8200b7945bfa7c76c2c0a8456d838076 (diff) | |
download | cpython-f3ce2ab2f1fc5234aad3e47c82a3e24301d8ef10.zip cpython-f3ce2ab2f1fc5234aad3e47c82a3e24301d8ef10.tar.gz cpython-f3ce2ab2f1fc5234aad3e47c82a3e24301d8ef10.tar.bz2 |
Revert 51759 because it broke all the buildbots
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r-- | Lib/subprocess.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 7c229dc..5438f15 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1000,10 +1000,14 @@ class Popen(object): if errwrite: os.dup2(errwrite, 2) - # Close pipe fds. Make sure we don't close the same - # fd more than once, or standard fds. - for fd in set((p2cread, c2pwrite, errwrite))-set((0,1,2)): - if fd: os.close(fd) + # Close pipe fds. Make sure we doesn't close the same + # fd more than once. + if p2cread: + os.close(p2cread) + if c2pwrite and c2pwrite not in (p2cread,): + os.close(c2pwrite) + if errwrite and errwrite not in (p2cread, c2pwrite): + os.close(errwrite) # Close all other fds, if asked for if close_fds: |