diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-09-26 20:22:44 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-09-26 20:22:44 (GMT) |
| commit | de10dbec778b55edae98aaae095188ef1acd6514 (patch) | |
| tree | c122ebda37cead5af96ded1367e31ec058b392c8 /Doc | |
| parent | 333ad92ec2d399873f5bf3a55a081830db4bedc1 (diff) | |
| parent | a24d2d82746fcdeddd635394b22e5ab480cbad4d (diff) | |
| download | cpython-de10dbec778b55edae98aaae095188ef1acd6514.zip cpython-de10dbec778b55edae98aaae095188ef1acd6514.tar.gz cpython-de10dbec778b55edae98aaae095188ef1acd6514.tar.bz2 | |
Issue #10673: Merge from 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/multiprocessing.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 1813eeb..79c5687 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -496,6 +496,9 @@ The :mod:`multiprocessing` package mostly replicates the API of the 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 + method times out. Check the process's :attr:`exitcode` to determine if + it terminated. A process can be joined many times. |