From acd9f7ce32b9d6cf819c99ee7728f9263f2bae47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= Date: Mon, 25 Jul 2011 18:35:49 +0200 Subject: [PATCH] Issue #11784: Improve multiprocessing.Process.join() documentation. Patch by Patrick Sabin. --- Doc/library/multiprocessing.rst | 7 +++---- Misc/ACKS | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 0e220d6c35f..c534adf97ad 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. diff --git a/Misc/ACKS b/Misc/ACKS index fc0e17da073..d9185e2746c 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -820,6 +820,7 @@ Jeff Rush Sam Rushing Mark Russell Nick Russo +Patrick Sabin Sébastien Sablé Hajime Saitou George Sakkis