diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-12-02 17:01:07 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-12-02 17:01:07 (GMT) |
| commit | b16edc8087586699e775d6fa6b20d750e9916fff (patch) | |
| tree | 29f904e4d42867fb3bb2ca14f60c1e50f1d961a0 | |
| parent | 3bf46471521ca69cc70d46bc60ad1287219b9d2c (diff) | |
| parent | d87de8358285cdd793e88e037024d143c3e47563 (diff) | |
| download | cpython-b16edc8087586699e775d6fa6b20d750e9916fff.zip cpython-b16edc8087586699e775d6fa6b20d750e9916fff.tar.gz cpython-b16edc8087586699e775d6fa6b20d750e9916fff.tar.bz2 | |
Merge 3.4 (asyncio doc)
| -rw-r--r-- | Doc/library/asyncio-task.rst | 2 | ||||
| -rw-r--r-- | 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 index 0d94cb8..3008c86 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -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. diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index e073802..a2128c5 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -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 |