Fixed subprocess bug #1531862 again, after removing tests

offending buildbot
This commit is contained in:
Gustavo Niemeyer 2006-09-07 00:48:33 +00:00
parent 9614868ece
commit c36bede6ff
3 changed files with 12 additions and 8 deletions

View File

@ -1000,14 +1000,10 @@ class Popen(object):
if errwrite: if errwrite:
os.dup2(errwrite, 2) os.dup2(errwrite, 2)
# Close pipe fds. Make sure we doesn't close the same # Close pipe fds. Make sure we don't close the same
# fd more than once. # fd more than once, or standard fds.
if p2cread: for fd in set((p2cread, c2pwrite, errwrite))-set((0,1,2)):
os.close(p2cread) if fd: os.close(fd)
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 # Close all other fds, if asked for
if close_fds: if close_fds:

View File

@ -234,6 +234,12 @@ class ProcessTestCase(unittest.TestCase):
stripped = remove_stderr_debug_decorations(output) stripped = remove_stderr_debug_decorations(output)
self.assertEqual(stripped, "appleorange") self.assertEqual(stripped, "appleorange")
def test_stdout_filedes_of_stdout(self):
# stdout is set to 1 (#1531862).
cmd = r"import sys, os; sys.exit(os.write(sys.stdout.fileno(), '.\n'))"
rc = subprocess.call([sys.executable, "-c", cmd], stdout=1)
self.assertEquals(rc, 2)
def test_cwd(self): def test_cwd(self):
tmpdir = os.getenv("TEMP", "/tmp") tmpdir = os.getenv("TEMP", "/tmp")
# We cannot use os.path.realpath to canonicalize the path, # We cannot use os.path.realpath to canonicalize the path,

View File

@ -48,6 +48,8 @@ Library
- Bug #1541863: uuid.uuid1 failed to generate unique identifiers - Bug #1541863: uuid.uuid1 failed to generate unique identifiers
on systems with low clock resolution. on systems with low clock resolution.
- Bug #1531862: Do not close standard file descriptors in subprocess.
Extension Modules Extension Modules
----------------- -----------------