diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2006-09-06 02:05:35 (GMT) |
|---|---|---|
| committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2006-09-06 02:05:35 (GMT) |
| commit | 63d675ce8200b7945bfa7c76c2c0a8456d838076 (patch) | |
| tree | cfd33137f8d0f35a0e41e76d24d47a61ed7f977c /Lib/subprocess.py | |
| parent | d7357791e8532dabc6f2e45343de8f75aa375652 (diff) | |
| download | cpython-63d675ce8200b7945bfa7c76c2c0a8456d838076.zip cpython-63d675ce8200b7945bfa7c76c2c0a8456d838076.tar.gz cpython-63d675ce8200b7945bfa7c76c2c0a8456d838076.tar.bz2 | |
Backporting fix for bug #1531862, committed in 51758, into 2.5,
making subprocess not close standard file descriptors.
Diffstat (limited to 'Lib/subprocess.py')
| -rw-r--r-- | Lib/subprocess.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 5438f15..7c229dc 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1000,14 +1000,10 @@ class Popen(object): if errwrite: os.dup2(errwrite, 2) - # 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 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 all other fds, if asked for if close_fds: |