summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-06 01:23:52 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-06 01:23:52 (GMT)
commited63754ef6b9d142539e77afc426442cb593b1a0 (patch)
treee01671dd334b7b7f6f6791258f1fe323473d1eae /Doc
parent648b5900d5ac25561ecb4c5fa9148134f6268cea (diff)
parent20d19241e5bae8e0af262142070fe8ff04b3e41b (diff)
downloadcpython-ed63754ef6b9d142539e77afc426442cb593b1a0.zip
cpython-ed63754ef6b9d142539e77afc426442cb593b1a0.tar.gz
cpython-ed63754ef6b9d142539e77afc426442cb593b1a0.tar.bz2
#17364: merge with 3.3.
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)``.