(original) (raw)

changeset: 104085:f91650739061 parent: 104082:a944b08d1ac7 parent: 104084:0414ce8a3b5c user: Berker Peksag berker.peksag@gmail.com date: Mon Sep 26 23:23:01 2016 +0300 description: Issue #10673: Merge from 3.6 diff -r a944b08d1ac7 -r f91650739061 Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst Mon Sep 26 23:15:04 2016 +0300 +++ b/Doc/library/multiprocessing.rst Mon Sep 26 23:23:01 2016 +0300 @@ -496,6 +496,9 @@ 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. /berker.peksag@gmail.com