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

[victor.stinner]

https://hg.python.org/cpython/rev/3dbed7a37730
changeset:   93705:3dbed7a37730
parent:      93703:c92c4cb5d5f7
parent:      93704:4b6b03c1f4ff
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Dec 02 18:01:07 2014 +0100
summary:
  Merge 3.4 (asyncio doc)

files:
  Doc/library/asyncio-task.rst |  2 +-
  Lib/asyncio/tasks.py         |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -413,7 +413,7 @@
 
       Return the list of stack frames for this task's coroutine.
 
-      If the coroutine is active, this returns the stack where it is suspended.
+      If the coroutine is not done, this returns the stack where it is suspended.
       If the coroutine has completed successfully or was cancelled, this
       returns an empty list.  If the coroutine was terminated by an exception,
       this returns the list of traceback frames.
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -109,7 +109,7 @@
     def get_stack(self, *, limit=None):
         """Return the list of stack frames for this task's coroutine.
 
-        If the coroutine is active, this returns the stack where it is
+        If the coroutine is not done, this returns the stack where it is
         suspended.  If the coroutine has completed successfully or was
         cancelled, this returns an empty list.  If the coroutine was
         terminated by an exception, this returns the list of traceback

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