summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-06 01:23:28 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-06 01:23:28 (GMT)
commit20d19241e5bae8e0af262142070fe8ff04b3e41b (patch)
treeef6577a005e743c0cdb0ca8d15144cfe6b37b220 /Doc
parent32b0f020341c53453bd9c791e75a7627fa2fa7fe (diff)
parent33e20d195440b98b81d7ab260922e466c4275bf0 (diff)
downloadcpython-20d19241e5bae8e0af262142070fe8ff04b3e41b.zip
cpython-20d19241e5bae8e0af262142070fe8ff04b3e41b.tar.gz
cpython-20d19241e5bae8e0af262142070fe8ff04b3e41b.tar.bz2
#17364: merge with 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/multiprocessing.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index a783efc..323e2fd 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -608,7 +608,6 @@ For an example of the usage of queues for interprocess communication see
:exc:`queue.Empty` exception (*timeout* is ignored in that case).
.. method:: get_nowait()
- get_no_wait()
Equivalent to ``get(False)``.