diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-09-06 00:22:15 +0800 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-09-06 00:22:15 +0800 |
| commit | 74470b5d3a472a2c69511631dc85e23035fc5a28 (patch) | |
| tree | 7e2be8fa87017072fe307180854710bffed7114a | |
| parent | 61a54b566220391a3f5f900ae0f4ffaafc894d12 (diff) | |
| parent | e969a2117c6fdbe794fad9292823a2d7edc7a6d0 (diff) | |
| download | cpython-git-74470b5d3a472a2c69511631dc85e23035fc5a28.tar.gz | |
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.
| -rw-r--r-- | Doc/library/multiprocessing.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 7c5ce05aa9..f68efede44 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -571,9 +571,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 @@ -582,9 +582,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]]) |