diff -r 7787a651e8b6 Lib/subprocess.py --- a/Lib/subprocess.py Mon Nov 25 06:40:12 2013 +0200 +++ b/Lib/subprocess.py Mon Nov 25 00:23:28 2013 -0800 @@ -1369,6 +1369,9 @@ os.path.join(os.fsencode(dir), executable) for dir in os.get_exec_path(env)) fds_to_keep = set(pass_fds) + # Never close stdin, stdout and stderr for the child. + fds_to_keep.update({0,1,2}) + # Our child uses this one to signal error before exec(). fds_to_keep.add(errpipe_write) self.pid = _posixsubprocess.fork_exec( args, executable_list, diff -r 7787a651e8b6 Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py Mon Nov 25 06:40:12 2013 +0200 +++ b/Lib/test/test_subprocess.py Mon Nov 25 00:23:28 2013 -0800 @@ -1559,6 +1559,27 @@ # all standard fds closed. self.check_close_std_fds([0, 1, 2]) + def test_small_errpipe_write_fd(self): + """Issue #15798: Popen should work when stdio fds are available.""" + new_stdin = os.dup(0) + new_stdout = os.dup(1) + try: + os.close(0) + os.close(1) + + # Side test: if errpipe_write fails to have its CLOEXEC + # flag set this should cause the parent to think the exec + # failed. Extremely unlikely: everyone supports CLOEXEC. + subprocess.Popen([ + sys.executable, "-c", + "print('AssertionError:0:CLOEXEC failure.')"]).wait() + finally: + # Restore original stdin and stdout + os.dup2(new_stdin, 0) + os.dup2(new_stdout, 1) + os.close(new_stdin) + os.close(new_stdout) + def test_remapping_std_fds(self): # open up some temporary files temps = [mkstemp() for i in range(3)] diff -r 7787a651e8b6 Modules/_posixsubprocess.c --- a/Modules/_posixsubprocess.c Mon Nov 25 06:40:12 2013 +0200 +++ b/Modules/_posixsubprocess.c Mon Nov 25 00:23:28 2013 -0800 @@ -449,7 +449,7 @@ local_max_fd = max_fd; #endif /* TODO HP-UX could use pstat_getproc() if anyone cares about it. */ - _close_open_fd_range(3, local_max_fd, py_fds_to_keep); + _close_open_fd_range(0, local_max_fd, py_fds_to_keep); } /* This loop matches the Lib/os.py _execvpe()'s PATH search when */ @@ -526,10 +526,6 @@ &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;