diff options
| author | Gregory P. Smith <greg@krypto.org> | 2014-06-01 20:47:34 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2014-06-01 20:47:34 (GMT) |
| commit | 45f31d14920dd86183f2358389640559b1f79263 (patch) | |
| tree | 95a76823394b2fb83b9493bedfe75d8a0d8cea9b | |
| parent | 3fe9e8d5a5ff730b3497fc4e5361bf15ccac14bb (diff) | |
| parent | ffd529cde138cb6ee211490dff13c6f6ee91e177 (diff) | |
| download | cpython-45f31d14920dd86183f2358389640559b1f79263.zip cpython-45f31d14920dd86183f2358389640559b1f79263.tar.gz cpython-45f31d14920dd86183f2358389640559b1f79263.tar.bz2 | |
merge the end_fd comment fix and explicit wait() for the child.
| -rw-r--r-- | Lib/test/test_subprocess.py | 2 | ||||
| -rw-r--r-- | Modules/_posixsubprocess.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index b1588e0..8aa436e 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1966,7 +1966,7 @@ class POSIXProcessTestCase(BaseTestCase): import subprocess, sys subprocess.Popen([sys.executable, {fd_status!r}] + [str(x) for x in range({max_fd})], - close_fds=True) + close_fds=True).wait() """.format(fd_status=fd_status, max_fd=max_fd_open+1))], stdout=subprocess.PIPE, close_fds=False) finally: diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index 8f5ce04..f84cd26 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -234,8 +234,8 @@ struct linux_dirent64 { char d_name[256]; /* Filename (null-terminated) */ }; -/* Close all open file descriptors in the range start_fd inclusive to end_fd - * exclusive. Do not close any in the sorted py_fds_to_keep list. +/* Close all open file descriptors in the range from start_fd and higher + * Do not close any in the sorted py_fds_to_keep list. * * This version is async signal safe as it does not make any unsafe C library * calls, malloc calls or handle any locks. It is _unfortunate_ to be forced |