summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2019-09-20 17:01:10 +0000
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-09-20 10:01:09 -0700
commit77abf23c67c1a465a8899666c69f6bcd6930e003 (patch)
tree9d0c7a044d4cfdc6e5026164a9cba1ce034f8578
parent9c2682efc69568e1b42a0c1759489d6f2e3b30ea (diff)
downloadcpython-git-77abf23c67c1a465a8899666c69f6bcd6930e003.tar.gz
bpo-6559: Update _posixsubprocess.fork_exec doc (GH-16283)
It did not list the argument added in d4cc7bf993eda4149a05ed25f2f33e18e43fd7c1. https://bugs.python.org/issue6559 Automerge-Triggered-By: @gpshead
-rw-r--r--Modules/_posixsubprocess.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index 25af00f70d..66db93e450 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -900,19 +900,22 @@ cleanup:
PyDoc_STRVAR(subprocess_fork_exec_doc,
-"fork_exec(args, executable_list, close_fds, cwd, env,\n\
+"fork_exec(args, executable_list, close_fds, pass_fds, cwd, env,\n\
p2cread, p2cwrite, c2pread, c2pwrite,\n\
errread, errwrite, errpipe_read, errpipe_write,\n\
restore_signals, call_setsid,\n\
- call_setgid, gid, groups_size, gids,\n\
- call_setuid, uid,\n\
+ gid, groups_list, uid,\n\
preexec_fn)\n\
\n\
Forks a child process, closes parent file descriptors as appropriate in the\n\
child and dups the few that are needed before calling exec() in the child\n\
process.\n\
\n\
-The preexec_fn, if supplied, will be called immediately before exec.\n\
+If close_fds is true, close file descriptors 3 and higher, except those listed\n\
+in the sorted tuple pass_fds.\n\
+\n\
+The preexec_fn, if supplied, will be called immediately before closing file\n\
+descriptors and exec.\n\
WARNING: preexec_fn is NOT SAFE if your application uses threads.\n\
It may trigger infrequent, difficult to debug deadlocks.\n\
\n\