summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-02-03 14:09:24 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-02-03 14:09:24 (GMT)
commit17d87f8ae42122025b5ce41230df6ba9e042ec40 (patch)
treea126c59405c2b6b93381df8bdc9e245ae810001b
parent3265344a85a2bac749230c2d6ef1b20edcd63906 (diff)
downloadcpython-17d87f8ae42122025b5ce41230df6ba9e042ec40.zip
cpython-17d87f8ae42122025b5ce41230df6ba9e042ec40.tar.gz
cpython-17d87f8ae42122025b5ce41230df6ba9e042ec40.tar.bz2
asyncio, Tulip issue 221: Fix doc of QueueEmpty and QueueFull
-rw-r--r--Doc/library/asyncio-sync.rst10
-rw-r--r--Lib/asyncio/queues.py8
2 files changed, 10 insertions, 8 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.
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index dce0d53..4aeb6c4 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -13,12 +13,16 @@ from .tasks import coroutine
class QueueEmpty(Exception):
- 'Exception raised by Queue.get(block=0)/get_nowait().'
+ """Exception raised when Queue.get_nowait() is called on a Queue object
+ which is empty.
+ """
pass
class QueueFull(Exception):
- 'Exception raised by Queue.put(block=0)/put_nowait().'
+ """Exception raised when the Queue.put_nowait() method is called on a Queue
+ object which is full.
+ """
pass