Mailman 3 October 2015 - Python-checkins

cpython (merge 3.4 -> 3.5): Merge 3.4 (os.urandom)
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/8165c7460596 changeset: 98456:8165c7460596 branch: 3.5 parent: 98452:835085cc28cd parent: 98455:83dc79eeaf7f user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 10:00:23 2015 +0200 summary: Merge 3.4 (os.urandom) files: Python/random.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Python/random.c b/Python/random.c --- a/Python/random.c +++ b/Python/random.c @@ -111,6 +111,8 @@ #else +/* Issue #25003: Don' use getentropy() on Solaris (available since + * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) #define PY_GETRANDOM 1 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #25003: os.urandom() doesn't use getentropy() on Solaris because
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/202c827f86df changeset: 98454:202c827f86df branch: 2.7 parent: 98411:8274fc521e69 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 09:57:26 2015 +0200 summary: Issue #25003: os.urandom() doesn't use getentropy() on Solaris because getentropy() is blocking, whereas os.urandom() should not block. getentropy() is supported since Solaris 11.3. files: Misc/NEWS | 4 ++++ Python/random.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #25003: os.urandom() doesn't use getentropy() on Solaris because + getentropy() is blocking, whereas os.urandom() should not block. getentropy() + is supported since Solaris 11.3. + - Issue #21167: NAN operations are now handled correctly when python is compiled with ICC even if -fp-model strict is not specified. diff --git a/Python/random.c b/Python/random.c --- a/Python/random.c +++ b/Python/random.c @@ -93,7 +93,11 @@ return 0; } -#elif HAVE_GETENTROPY +/* Issue #25003: Don' use getentropy() on Solaris (available since + * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ +#elif defined(HAVE_GETENTROPY) && !defined(sun) +#define PY_GETENTROPY 1 + /* Fill buffer with size pseudo-random bytes generated by getentropy(). Return 0 on success, or raise an exception and return -1 on error. If fatal is nonzero, call Py_FatalError() instead of raising an exception @@ -333,7 +337,7 @@ #ifdef MS_WINDOWS return win32_urandom((unsigned char *)buffer, size, 1); -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) return py_getentropy(buffer, size, 0); #else # ifdef __VMS @@ -396,7 +400,7 @@ (void)win32_urandom((unsigned char *)secret, secret_size, 0); #elif __VMS vms_urandom((unsigned char *)secret, secret_size, 0); -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) (void)py_getentropy(secret, secret_size, 1); #else dev_urandom_noraise(secret, secret_size); @@ -412,7 +416,7 @@ CryptReleaseContext(hCryptProv, 0); hCryptProv = 0; } -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) /* nothing to clean */ #else dev_urandom_close(); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/710ef035ee44 changeset: 98453:710ef035ee44 parent: 98451:bae0912dd160 parent: 98452:835085cc28cd user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 09:51:02 2015 +0200 summary: Merge 3.5 files: Python/random.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/random.c b/Python/random.c --- a/Python/random.c +++ b/Python/random.c @@ -73,7 +73,7 @@ } #elif defined(HAVE_GETENTROPY) && !defined(sun) -#define PY_GETENTROPY +#define PY_GETENTROPY 1 /* Fill buffer with size pseudo-random bytes generated by getentropy(). Return 0 on success, or raise an exception and return -1 on error. @@ -112,7 +112,7 @@ #else #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) -#define PY_GETRANDOM +#define PY_GETRANDOM 1 static int py_getrandom(void *buffer, Py_ssize_t size, int raise) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the getrandom()
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/835085cc28cd changeset: 98452:835085cc28cd branch: 3.5 parent: 98450:898a9a959927 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 09:47:30 2015 +0200 summary: Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the getrandom() function instead of the getentropy() function. The getentropy() function is blocking to generate very good quality entropy, os.urandom() doesn't need such high-quality entropy. files: Lib/test/test_os.py | 16 ++++++---- Misc/NEWS | 5 +++ Python/random.c | 49 ++++++++++++++++++++++---------- configure | 43 ++++++++++++++++++++++++++-- configure.ac | 31 ++++++++++++++++++-- pyconfig.h.in | 3 ++ 6 files changed, 119 insertions(+), 28 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1226,13 +1226,15 @@ self.assertNotEqual(data1, data2) -HAVE_GETENTROPY = (sysconfig.get_config_var('HAVE_GETENTROPY') == 1) -HAVE_GETRANDOM = (sysconfig.get_config_var('HAVE_GETRANDOM_SYSCALL') == 1) - -(a)unittest.skipIf(HAVE_GETENTROPY, - "getentropy() does not use a file descriptor") -(a)unittest.skipIf(HAVE_GETRANDOM, - "getrandom() does not use a file descriptor") +# os.urandom() doesn't use a file descriptor when it is implemented with the +# getentropy() function, the getrandom() function or the getrandom() syscall +OS_URANDOM_DONT_USE_FD = ( + sysconfig.get_config_var('HAVE_GETENTROPY') == 1 + or sysconfig.get_config_var('HAVE_GETRANDOM') == 1 + or sysconfig.get_config_var('HAVE_GETRANDOM_SYSCALL') == 1) + +(a)unittest.skipIf(OS_URANDOM_DONT_USE_FD , + "os.random() does not use a file descriptor") class URandomFDTests(unittest.TestCase): @unittest.skipUnless(resource, "test requires the resource module") def test_urandom_failure(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -11,6 +11,11 @@ Core and Builtins ----------------- +- Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the + getrandom() function instead of the getentropy() function. The getentropy() + function is blocking to generate very good quality entropy, os.urandom() + doesn't need such high-quality entropy. + - Issue #25182: The stdprinter (used as sys.stderr before the io module is imported at startup) now uses the backslashreplace error handler. diff --git a/Python/random.c b/Python/random.c --- a/Python/random.c +++ b/Python/random.c @@ -6,7 +6,9 @@ # ifdef HAVE_SYS_STAT_H # include <sys/stat.h> # endif -# ifdef HAVE_GETRANDOM_SYSCALL +# ifdef HAVE_GETRANDOM +# include <sys/random.h> +# elif defined(HAVE_GETRANDOM_SYSCALL) # include <sys/syscall.h> # endif #endif @@ -70,7 +72,9 @@ return 0; } -#elif HAVE_GETENTROPY +#elif defined(HAVE_GETENTROPY) && !defined(sun) +#define PY_GETENTROPY 1 + /* Fill buffer with size pseudo-random bytes generated by getentropy(). Return 0 on success, or raise an exception and return -1 on error. @@ -105,16 +109,19 @@ return 0; } -#else /* !HAVE_GETENTROPY */ +#else -#ifdef HAVE_GETRANDOM_SYSCALL +#if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) +#define PY_GETRANDOM 1 + static int py_getrandom(void *buffer, Py_ssize_t size, int raise) { - /* is getrandom() supported by the running kernel? - * need Linux kernel 3.17 or later */ + /* Is getrandom() supported by the running kernel? + * Need Linux kernel 3.17 or newer, or Solaris 11.3 or newer */ static int getrandom_works = 1; - /* Use /dev/urandom, block if the kernel has no entropy */ + /* Use non-blocking /dev/urandom device. On Linux at boot, the getrandom() + * syscall blocks until /dev/urandom is initialized with enough entropy. */ const int flags = 0; int n; @@ -124,7 +131,18 @@ while (0 < size) { errno = 0; - /* Use syscall() because the libc doesn't expose getrandom() yet, see: +#ifdef HAVE_GETRANDOM + if (raise) { + Py_BEGIN_ALLOW_THREADS + n = getrandom(buffer, size, flags); + Py_END_ALLOW_THREADS + } + else { + n = getrandom(buffer, size, flags); + } +#else + /* On Linux, use the syscall() function because the GNU libc doesn't + * expose the Linux getrandom() syscall yet. See: * https://sourceware.org/bugzilla/show_bug.cgi?id=17252 */ if (raise) { Py_BEGIN_ALLOW_THREADS @@ -134,6 +152,7 @@ else { n = syscall(SYS_getrandom, buffer, size, flags); } +#endif if (n < 0) { if (errno == ENOSYS) { @@ -182,7 +201,7 @@ assert (0 < size); -#ifdef HAVE_GETRANDOM_SYSCALL +#ifdef PY_GETRANDOM if (py_getrandom(buffer, size, 0) == 1) return; /* getrandom() is not supported by the running kernel, fall back @@ -218,14 +237,14 @@ int fd; Py_ssize_t n; struct _Py_stat_struct st; -#ifdef HAVE_GETRANDOM_SYSCALL +#ifdef PY_GETRANDOM int res; #endif if (size <= 0) return 0; -#ifdef HAVE_GETRANDOM_SYSCALL +#ifdef PY_GETRANDOM res = py_getrandom(buffer, size, 1); if (res < 0) return -1; @@ -304,7 +323,7 @@ } } -#endif /* HAVE_GETENTROPY */ +#endif /* Fill buffer with pseudo-random bytes generated by a linear congruent generator (LCG): @@ -345,7 +364,7 @@ #ifdef MS_WINDOWS return win32_urandom((unsigned char *)buffer, size, 1); -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) return py_getentropy(buffer, size, 0); #else return dev_urandom_python((char*)buffer, size); @@ -392,7 +411,7 @@ else { #ifdef MS_WINDOWS (void)win32_urandom(secret, secret_size, 0); -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) (void)py_getentropy(secret, secret_size, 1); #else dev_urandom_noraise(secret, secret_size); @@ -408,7 +427,7 @@ CryptReleaseContext(hCryptProv, 0); hCryptProv = 0; } -#elif HAVE_GETENTROPY +#elif defined(PY_GETENTROPY) /* nothing to clean */ #else dev_urandom_close(); diff --git a/configure b/configure --- a/configure +++ b/configure @@ -16085,11 +16085,11 @@ #include <sys/syscall.h> int main() { + char buffer[1]; + const size_t buflen = sizeof(buffer); const int flags = 0; - char buffer[1]; - int n; /* ignore the result, Python checks for ENOSYS at runtime */ - (void)syscall(SYS_getrandom, buffer, sizeof(buffer), flags); + (void)syscall(SYS_getrandom, buffer, buflen, flags); return 0; } @@ -16111,6 +16111,43 @@ fi +# check if the getrandom() function is available +# the test was written for the Solaris function of <sys/random.h> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the getrandom() function" >&5 +$as_echo_n "checking for the getrandom() function... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include <sys/random.h> + + int main() { + char buffer[1]; + const size_t buflen = sizeof(buffer); + const int flags = 0; + /* ignore the result, Python checks for ENOSYS at runtime */ + (void)getrandom(buffer, buflen, flags); + return 0; + } + + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_getrandom=yes +else + have_getrandom=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getrandom" >&5 +$as_echo "$have_getrandom" >&6; } + +if test "$have_getrandom" = yes; then + +$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h + +fi + # generate output files ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh" diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -5154,11 +5154,11 @@ #include <sys/syscall.h> int main() { + char buffer[1]; + const size_t buflen = sizeof(buffer); const int flags = 0; - char buffer[1]; - int n; /* ignore the result, Python checks for ENOSYS at runtime */ - (void)syscall(SYS_getrandom, buffer, sizeof(buffer), flags); + (void)syscall(SYS_getrandom, buffer, buflen, flags); return 0; } ]]) @@ -5170,6 +5170,31 @@ [Define to 1 if the Linux getrandom() syscall is available]) fi +# check if the getrandom() function is available +# the test was written for the Solaris function of <sys/random.h> +AC_MSG_CHECKING(for the getrandom() function) +AC_LINK_IFELSE( +[ + AC_LANG_SOURCE([[ + #include <sys/random.h> + + int main() { + char buffer[1]; + const size_t buflen = sizeof(buffer); + const int flags = 0; + /* ignore the result, Python checks for ENOSYS at runtime */ + (void)getrandom(buffer, buflen, flags); + return 0; + } + ]]) +],[have_getrandom=yes],[have_getrandom=no]) +AC_MSG_RESULT($have_getrandom) + +if test "$have_getrandom" = yes; then + AC_DEFINE(HAVE_GETRANDOM, 1, + [Define to 1 if the getrandom() function is available]) +fi + # generate output files AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) diff --git a/pyconfig.h.in b/pyconfig.h.in --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -395,6 +395,9 @@ /* Define to 1 if you have the `getpwent' function. */ #undef HAVE_GETPWENT +/* Define to 1 if the getrandom() function is available */ +#undef HAVE_GETRANDOM + /* Define to 1 if the Linux getrandom() syscall is available */ #undef HAVE_GETRANDOM_SYSCALL -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): (Merge 3.5) Issue #25274: test_recursionlimit_recovery() of test_sys now checks
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/bae0912dd160 changeset: 98451:bae0912dd160 parent: 98448:1465b18ef4fc parent: 98450:898a9a959927 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 08:56:54 2015 +0200 summary: (Merge 3.5) Issue #25274: test_recursionlimit_recovery() of test_sys now checks sys.gettrace() when the test is executed, not when the module is loaded. sys.settrace() may be after after the test is loaded. files: Lib/test/test_sys.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -197,9 +197,10 @@ self.assertEqual(sys.getrecursionlimit(), 10000) sys.setrecursionlimit(oldlimit) - @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), - 'fatal error if run with a trace function') def test_recursionlimit_recovery(self): + if hasattr(sys, 'gettrace') and sys.gettrace(): + self.skipTest('fatal error if run with a trace function') + # NOTE: this test is slightly fragile in that it depends on the current # recursion count when executing the test being low enough so as to # trigger the recursion recovery detection in the _Py_MakeEndRecCheck -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): (Merge 3.4) Issue #25274: test_recursionlimit_recovery() of test_sys now checks
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/898a9a959927 changeset: 98450:898a9a959927 branch: 3.5 parent: 98447:d7d18ef3e05c parent: 98449:60c4fd84ef92 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 08:56:27 2015 +0200 summary: (Merge 3.4) Issue #25274: test_recursionlimit_recovery() of test_sys now checks sys.gettrace() when the test is executed, not when the module is loaded. sys.settrace() may be after after the test is loaded. files: Lib/test/test_sys.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -197,9 +197,10 @@ self.assertEqual(sys.getrecursionlimit(), 10000) sys.setrecursionlimit(oldlimit) - @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), - 'fatal error if run with a trace function') def test_recursionlimit_recovery(self): + if hasattr(sys, 'gettrace') and sys.gettrace(): + self.skipTest('fatal error if run with a trace function') + # NOTE: this test is slightly fragile in that it depends on the current # recursion count when executing the test being low enough so as to # trigger the recursion recovery detection in the _Py_MakeEndRecCheck -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #25274: test_recursionlimit_recovery() of test_sys now checks
by victor.stinner Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/60c4fd84ef92 changeset: 98449:60c4fd84ef92 branch: 3.4 parent: 98446:9a10055e12fa user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Oct 01 08:55:33 2015 +0200 summary: Issue #25274: test_recursionlimit_recovery() of test_sys now checks sys.gettrace() when the test is executed, not when the module is loaded. sys.settrace() may be after after the test is loaded. files: Lib/test/test_sys.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -197,9 +197,10 @@ self.assertEqual(sys.getrecursionlimit(), 10000) sys.setrecursionlimit(oldlimit) - @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(), - 'fatal error if run with a trace function') def test_recursionlimit_recovery(self): + if hasattr(sys, 'gettrace') and sys.gettrace(): + self.skipTest('fatal error if run with a trace function') + # NOTE: this test is slightly fragile in that it depends on the current # recursion count when executing the test being low enough so as to # trigger the recursion recovery detection in the _Py_MakeEndRecCheck -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5 -> default
by andrew.svetlov Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/1465b18ef4fc changeset: 98448:1465b18ef4fc parent: 98445:33a5ab6c578a parent: 98447:d7d18ef3e05c user: Andrew Svetlov <andrew.svetlov(a)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

1 0

cpython (merge 3.4 -> 3.5): Merge 3.4 -> 3.5
by andrew.svetlov Oct. 1, 2015

Oct. 1, 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(a)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

1 0

cpython (3.4): Reflect parameter name change in the doc
by andrew.svetlov Oct. 1, 2015

Oct. 1, 2015

https://hg.python.org/cpython/rev/9a10055e12fa changeset: 98446:9a10055e12fa branch: 3.4 parent: 98438:2652c1798f7d user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Thu Oct 01 09:48:08 2015 +0300 summary: Reflect parameter name change in the doc 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 @@ -582,14 +582,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

1 0