mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
Fixed bug #1531862: Do not close standard file descriptors in subprocess.
Let's try that once more. Buildbots were broken last time, but probably because tests were sending data to stderr for testing it (sending to a file doesn't touch the problem). The fix is still the same, but tests were reduced (removing tests to be able to fix something is weird, but oh well).
This commit is contained in:
parent
8a230b50a1
commit
d1b1b8c882
3 changed files with 18 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