Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-07-24 02:33:32 -04:00
commit 2e57dcc87e
1 changed files with 1 additions and 1 deletions

View File

@ -261,7 +261,7 @@ Example combining a :class:`Future` and a :ref:`coroutine function
print(future.result()) print(future.result())
loop.close() loop.close()
The coroutine function is responsible of the computation (which takes 1 second) The coroutine function is responsible for the computation (which takes 1 second)
and it stores the result into the future. The and it stores the result into the future. The
:meth:`~BaseEventLoop.run_until_complete` method waits for the completion of :meth:`~BaseEventLoop.run_until_complete` method waits for the completion of
the future. the future.