Merge 3.4 (asyncio doc)

This commit is contained in:
Victor Stinner 2014-12-22 22:07:29 +01:00
commit 1bdef7aefa
1 changed files with 13 additions and 8 deletions

View File

@ -293,7 +293,7 @@ Queue
.. method:: full()
Return ``True`` if there are maxsize items in the queue.
Return ``True`` if there are :attr:`maxsize` items in the queue.
.. note::
@ -302,12 +302,15 @@ Queue
.. method:: get()
Remove and return an item from the queue.
If you yield from :meth:`get()`, wait until a item is available.
Remove and return an item from the queue. If queue is empty, wait until
an item is available.
This method is a :ref:`coroutine <coroutine>`.
.. seealso::
The :meth:`empty` method.
.. method:: get_nowait()
Remove and return an item from the queue.
@ -317,13 +320,15 @@ Queue
.. method:: put(item)
Put an item into the queue.
If you yield from ``put()``, wait until a free slot is available before
adding item.
Put an item into the queue. If the queue is full, wait until a free slot
is available before adding item.
This method is a :ref:`coroutine <coroutine>`.
.. seealso::
The :meth:`full` method.
.. method:: put_nowait(item)
Put an item into the queue without blocking.