Merge 3.4 (asyncio doc)

This commit is contained in:
Victor Stinner 2015-02-03 15:12:13 +01:00
commit 7277761428
2 changed files with 10 additions and 8 deletions

View File

@ -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.

View File

@ -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