summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-12-15 16:51:16 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-12-15 16:51:16 (GMT)
commit53703406abc6f01986540337f9121696539ab3ed (patch)
tree28b7dd0d52a3649bd0f0c90cea8c86669bd35726 /Doc
parent8d33598e5dd021aaac4f155ab319bad3ba4e1eef (diff)
parent4d5115c7b55a7b2a49324572f138298b0f3df916 (diff)
downloadcpython-53703406abc6f01986540337f9121696539ab3ed.zip
cpython-53703406abc6f01986540337f9121696539ab3ed.tar.gz
cpython-53703406abc6f01986540337f9121696539ab3ed.tar.bz2
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-eventloop.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index d6c2e30..748d4e3 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -85,7 +85,9 @@ keywords to your callback, use :func:`functools.partial`. For example,
.. method:: BaseEventLoop.call_soon(callback, \*args)
- Arrange for a callback to be called as soon as possible.
+ Arrange for a callback to be called as soon as possible. The callback is
+ called after :meth:`call_soon` returns, when control returns to the event
+ loop.
This operates as a FIFO queue, callbacks are called in the order in
which they are registered. Each callback will be called exactly once.