From 9541f8eb2b820dad3576c039ae2cba7f13ba5fc0 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Tue, 6 Sep 2011 00:23:10 +0800 Subject: =?UTF-8?q?merge=20from=203.2.=20=20Fix=20closes=20Issue11155=20?= =?UTF-8?q?=20-=20Correct=20the=20multiprocessing.Queue.put's=20arg=20(rep?= =?UTF-8?q?lace=20'item'=20with=20'obj')=20in=20the=20docs.=20Patch=20by?= =?UTF-8?q?=20Westley=20Mart=C3=ADnez.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/library/multiprocessing.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 45da5d3..30c4b10 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -552,9 +552,9 @@ For an example of the usage of queues for interprocess communication see Return ``True`` if the queue is full, ``False`` otherwise. Because of multithreading/multiprocessing semantics, this is not reliable. - .. method:: put(item[, block[, timeout]]) + .. method:: put(obj[, block[, timeout]]) - Put item into the queue. If the optional argument *block* is ``True`` + Put obj into the queue. If the optional argument *block* is ``True`` (the default) and *timeout* is ``None`` (the default), block if necessary until a free slot is available. If *timeout* is a positive number, it blocks at most *timeout* seconds and raises the :exc:`Queue.Full` exception if no @@ -563,9 +563,9 @@ For an example of the usage of queues for interprocess communication see available, else raise the :exc:`Queue.Full` exception (*timeout* is ignored in that case). - .. method:: put_nowait(item) + .. method:: put_nowait(obj) - Equivalent to ``put(item, False)``. + Equivalent to ``put(obj, False)``. .. method:: get([block[, timeout]]) -- cgit v0.12