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

[victor.stinner]

https://hg.python.org/cpython/rev/c92c4cb5d5f7
changeset:   93703:c92c4cb5d5f7
parent:      93701:0744ceb5c0ed
parent:      93702:a4b58e779a16
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Dec 02 17:52:57 2014 +0100
summary:
  Merge 3.4 (asyncio doc)

files:
  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
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -337,14 +337,9 @@
     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

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