[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio doc)

victor.stinner python-checkins at python.org
Tue Feb 3 15:13:55 CET 2015


https://hg.python.org/cpython/rev/7494f3972726
changeset:   94489:7494f3972726
parent:      94487:3fdbdf4d2ac7
parent:      94488:fd445d2dd107
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Feb 03 15:12:13 2015 +0100
summary:
  Merge 3.4 (asyncio doc)

files:
  Doc/library/asyncio-sync.rst |  10 ++++------
  Lib/asyncio/queues.py        |   8 ++++++--
  2 files changed, 10 insertions(+), 8 deletions(-)


diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
--- a/Doc/library/asyncio-sync.rst
+++ b/Doc/library/asyncio-sync.rst
@@ -428,13 +428,11 @@
 
 .. 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
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -13,12 +13,16 @@
 
 
 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
 
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list