cpython: 0414ce8a3b5c (original) (raw)
Mercurial > cpython
changeset 104084:0414ce8a3b5c 3.6
Issue #10673: Merge from 3.5 [#10673]
Berker Peksag berker.peksag@gmail.com | |
---|---|
date | Mon, 26 Sep 2016 23:22:44 +0300 |
parents | 2cf16c627c17(current diff)112060f8abe8(diff) |
children | f91650739061 c2eb90422aec |
files | Doc/library/multiprocessing.rst |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-)[+] [-] Doc/library/multiprocessing.rst 3 |
line wrap: on
line diff
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -496,6 +496,9 @@ The :mod:multiprocessing
package mostl
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.
Note that the method returns ``None`` if its process terminates or if the[](#l1.7)
method times out. Check the process's :attr:`exitcode` to determine if[](#l1.8)
it terminated.[](#l1.9)