mirror of
https://github.com/python/cpython.git
synced 2025-10-09 08:31:26 +00:00
Backporting fix for bug #1531862, committed in 51758, into 2.5,
making subprocess not close standard file descriptors.
This commit is contained in:
parent
d7357791e8
commit
63d675ce82
3 changed files with 48 additions and 8 deletions
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue