diff options
| author | Larry Hastings <larry@hastings.org> | 2015-03-30 01:50:00 -0700 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-03-30 01:50:00 -0700 |
| commit | 09dab7a87eaa7115eeaf73016d65f2f835e25986 (patch) | |
| tree | 04a83c1cfce64d3418a245feae7fee445e510949 /Modules/_posixsubprocess.c | |
| parent | 736240399e469a4134dac32a340feca5395baa28 (diff) | |
| parent | 45cff0c0e6c4a31ed3b5b88ee803320862fbd43a (diff) | |
| download | cpython-git-09dab7a87eaa7115eeaf73016d65f2f835e25986.tar.gz | |
Merge 3.5.0a3 release engineering changes back into trunk.
Diffstat (limited to 'Modules/_posixsubprocess.c')
| -rw-r--r-- | Modules/_posixsubprocess.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index a33df211e9..0b385a1ab1 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -254,10 +254,9 @@ _close_open_fds_safe(int start_fd, PyObject* py_fds_to_keep) { int fd_dir_fd; - fd_dir_fd = _Py_open(FD_DIR, O_RDONLY); + fd_dir_fd = _Py_open_noraise(FD_DIR, O_RDONLY); if (fd_dir_fd == -1) { /* No way to get a list of open fds. */ - PyErr_Clear(); _close_fds_by_brute_force(start_fd, py_fds_to_keep); return; } else { |