[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 -> 3.5
andrew.svetlov
python-checkins at python.org
Thu Oct 1 08:49:12 CEST 2015
https://hg.python.org/cpython/rev/d7d18ef3e05c
changeset: 98447:d7d18ef3e05c
branch: 3.5
parent: 98439:0eb26a4d5ffa
parent: 98446:9a10055e12fa
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Thu Oct 01 09:48:36 2015 +0300
summary:
Merge 3.4 -> 3.5
files:
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
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -586,14 +586,14 @@
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>`.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list