Merge 3.4 (asyncio doc)

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