[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 -> default

Thu Oct 1 08:49:13 CEST 2015

https://hg.python.org/cpython/rev/1465b18ef4fc
changeset: 98448:1465b18ef4fc
parent: 98445:33a5ab6c578a
parent: 98447:d7d18ef3e05c
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Thu Oct 01 09:49:03 2015 +0300
summary:
 Merge 3.5 -> default
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
