Merge 3.4 (asyncio doc)

This commit is contained in:
Victor Stinner 2014-12-02 18:01:07 +01:00
commit b16edc8087
2 changed files with 2 additions and 2 deletions

View File

@ -413,7 +413,7 @@ Task
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.

View File

@ -109,7 +109,7 @@ class Task(futures.Future):
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