diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-07-25 16:35:49 (GMT) |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-07-25 16:35:49 (GMT) |
| commit | acd9f7ce32b9d6cf819c99ee7728f9263f2bae47 (patch) | |
| tree | 2d3c8b9cd414a7ff67d70ce39124a6ea2b1d47e2 | |
| parent | 432171c6872b0eaa1010657f7eb280136bf96890 (diff) | |
| download | cpython-acd9f7ce32b9d6cf819c99ee7728f9263f2bae47.zip cpython-acd9f7ce32b9d6cf819c99ee7728f9263f2bae47.tar.gz cpython-acd9f7ce32b9d6cf819c99ee7728f9263f2bae47.tar.bz2 | |
Issue #11784: Improve multiprocessing.Process.join() documentation. Patch by
Patrick Sabin.
| -rw-r--r-- | Doc/library/multiprocessing.rst | 7 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 0e220d6..c534adf 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -343,10 +343,9 @@ The :mod:`multiprocessing` package mostly replicates the API of the .. method:: join([timeout]) - Block the calling thread until the process whose :meth:`join` method is - called terminates or until the optional timeout occurs. - - If *timeout* is ``None`` then there is no timeout. + If the optional argument *timeout* is ``None`` (the default), the method + blocks until the process whose :meth:`join` method is called terminates. + If *timeout* is a positive number, it blocks at most *timeout* seconds. A process can be joined many times. @@ -820,6 +820,7 @@ Jeff Rush Sam Rushing Mark Russell Nick Russo +Patrick Sabin Sébastien Sablé Hajime Saitou George Sakkis |