[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2. Fix closes Issue11155 - Correct the

[senthil.kumaran]

http://hg.python.org/cpython/rev/8f1187288fac
changeset:   72288:8f1187288fac
parent:      72283:1cc83e603319
parent:      72287:c6d4d4d64405
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 06 00:22:15 2011 +0800
summary:
  merge from 3.2. Fix closes Issue11155  - Correct the multiprocessing.Queue.put's arg (replace 'item' with 'obj') in the docs. Patch by Westley Martínez.

files:
  Doc/library/multiprocessing.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -571,9 +571,9 @@
       Return ``True`` if the queue is full, ``False`` otherwise.  Because of
       multithreading/multiprocessing semantics, this is not reliable.
 
-   .. method:: put(item[, block[, timeout]])
-
-      Put item into the queue.  If the optional argument *block* is ``True``
+   .. method:: put(obj[, block[, timeout]])
+
+      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
@@ -582,9 +582,9 @@
       available, else raise the :exc:`queue.Full` exception (*timeout* is
       ignored in that case).
 
-   .. method:: put_nowait(item)
-
-      Equivalent to ``put(item, False)``.
+   .. method:: put_nowait(obj)
+
+      Equivalent to ``put(obj, False)``.
 
    .. method:: get([block[, timeout]])
 

-- 
Repository URL: http://hg.python.org/cpython