diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2015-10-01 06:48:36 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2015-10-01 06:48:36 (GMT) |
| commit | 313242aa03aed2ebdaa0dd47428b60b68d8a4e78 (patch) | |
| tree | 45d4846997be6bee468fae2a416819b5eab47ff1 /Doc/library/asyncio-eventloop.rst | |
| parent | ae86da9b204b0fe2510309bd9fae688e7c9a35fb (diff) | |
| parent | 1c62b52c3f2dceeaab99b1599c8654279fe5225f (diff) | |
| download | cpython-313242aa03aed2ebdaa0dd47428b60b68d8a4e78.zip cpython-313242aa03aed2ebdaa0dd47428b60b68d8a4e78.tar.gz cpython-313242aa03aed2ebdaa0dd47428b60b68d8a4e78.tar.bz2 | |
Merge 3.4 -> 3.5
Diffstat (limited to 'Doc/library/asyncio-eventloop.rst')
| -rw-r--r-- | Doc/library/asyncio-eventloop.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 0792a83..1de5f7b 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -586,14 +586,14 @@ Call a function in an :class:`~concurrent.futures.Executor` (pool of threads or pool of processes). By default, an event loop uses a thread pool executor (:class:`~concurrent.futures.ThreadPoolExecutor`). -.. coroutinemethod:: BaseEventLoop.run_in_executor(executor, callback, \*args) +.. coroutinemethod:: BaseEventLoop.run_in_executor(executor, func, \*args) - Arrange for a callback to be called in the specified executor. + Arrange for a *func* to be called in the specified executor. The *executor* argument should be an :class:`~concurrent.futures.Executor` instance. The default executor is used if *executor* is ``None``. - :ref:`Use functools.partial to pass keywords to the callback + :ref:`Use functools.partial to pass keywords to the *func* <asyncio-pass-keywords>`. This method is a :ref:`coroutine <coroutine>`. |