Undo supposed fix for Issue #15798 until I understand why this is

causing test_multiprocessing_forkserver and test_multiprocessing_spawn
failures on head (3.4).
This commit is contained in:
Gregory P. Smith 2013-12-01 00:12:24 -08:00
parent 1eda9e7c30
commit 361e30c17a
4 changed files with 6 additions and 29 deletions

View file

@ -449,7 +449,7 @@ child_exec(char *const exec_array[],
local_max_fd = max_fd;
#endif
/* TODO HP-UX could use pstat_getproc() if anyone cares about it. */
_close_open_fd_range(0, local_max_fd, py_fds_to_keep);
_close_open_fd_range(3, local_max_fd, py_fds_to_keep);
}
/* This loop matches the Lib/os.py _execvpe()'s PATH search when */
@ -526,6 +526,10 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
&restore_signals, &call_setsid, &preexec_fn))
return NULL;
if (close_fds && errpipe_write < 3) { /* precondition */
PyErr_SetString(PyExc_ValueError, "errpipe_write must be >= 3");
return NULL;
}
if (PySequence_Length(py_fds_to_keep) < 0) {
PyErr_SetString(PyExc_ValueError, "cannot get length of fds_to_keep");
return NULL;