summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-02-03 14:12:13 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-02-03 14:12:13 (GMT)
commit72777614287a3f0feaaf1d0987ec275e94ede280 (patch)
tree4c067baea898c6241dca95706121d1cfc936a4b5 /Doc
parentb9765eec5cbc149120acb50646256cffde94d74f (diff)
parent17d87f8ae42122025b5ce41230df6ba9e042ec40 (diff)
downloadcpython-72777614287a3f0feaaf1d0987ec275e94ede280.zip
cpython-72777614287a3f0feaaf1d0987ec275e94ede280.tar.gz
cpython-72777614287a3f0feaaf1d0987ec275e94ede280.tar.bz2
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-sync.rst10
1 files changed, 4 insertions, 6 deletions
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
index 4cc9a96..80974d9 100644
--- a/Doc/library/asyncio-sync.rst
+++ b/Doc/library/asyncio-sync.rst
@@ -428,13 +428,11 @@ Exceptions
.. exception:: QueueEmpty
- Exception raised when non-blocking :meth:`~Queue.get` (or
- :meth:`~Queue.get_nowait`) is called
- on a :class:`Queue` object which is empty.
+ Exception raised when the :meth:`~Queue.get_nowait` method is called on a
+ :class:`Queue` object which is empty.
.. exception:: QueueFull
- Exception raised when non-blocking :meth:`~Queue.put` (or
- :meth:`~Queue.put_nowait`) is called
- on a :class:`Queue` object which is full.
+ Exception raised when the :meth:`~Queue.put_nowait` method is called on a
+ :class:`Queue` object which is full.