diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-12-02 16:52:57 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-12-02 16:52:57 (GMT) |
commit | 3bf46471521ca69cc70d46bc60ad1287219b9d2c (patch) | |
tree | 79a50bbd4330c2b1da80e21fcc26f5bddcb1d230 | |
parent | de010a968525bfb2680f758f59b175a929d4c0d8 (diff) | |
parent | 039f703b7b6c80bb7ef35f490447529b2747560f (diff) | |
download | cpython-3bf46471521ca69cc70d46bc60ad1287219b9d2c.zip cpython-3bf46471521ca69cc70d46bc60ad1287219b9d2c.tar.gz cpython-3bf46471521ca69cc70d46bc60ad1287219b9d2c.tar.bz2 |
Merge 3.4 (asyncio doc)
-rw-r--r-- | Doc/library/asyncio-task.rst | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index a07db29..0d94cb8 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -337,14 +337,9 @@ flow:: finally: loop.close() -In this example, the future is responsible to display the result and to stop -the loop. - -.. note:: - The "slow_operation" coroutine object is only executed when the event loop - starts running, so it is possible to add a "done callback" to the future - after creating the task scheduling the coroutine object. - +In this example, the future is used to link ``slow_operation()`` to +``got_result()``: when ``slow_operation()`` is done, ``got_result()`` is called +with the result. Task |