Mailman 3 December 2018 - Python-checkins

bpo-35214: MSan workarounds for socket, time, and test_faulthandler. (GH-11375) (GH-11378)
by Gregory P. Smith Dec. 31, 2018

Dec. 31, 2018

https://github.com/python/cpython/commit/01b9664740307b39c2907bd84cbb0b2c35… commit: 01b9664740307b39c2907bd84cbb0b2c35be9df4 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Gregory P. Smith <greg(a)krypto.org> date: 2018-12-30T17:59:19-08:00 summary: bpo-35214: MSan workarounds for socket, time, and test_faulthandler. (GH-11375) (GH-11378) Add Clang Memory Sanitizer build instrumentation to work around false positives from the socket and time modules as well as skipping a couple test_faulthandler tests. (cherry picked from commit b474e6774d60fa67d5373e361a0ed53c18b24f53) Co-authored-by: Gregory P. Smith <greg(a)krypto.org> files: A Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst M Lib/test/test_faulthandler.py M Modules/socketmodule.c M Modules/timemodule.c diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index d6dc4ba55d9b..984690f248ba 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -5,6 +5,7 @@ import signal import subprocess import sys +import sysconfig from test import support from test.support import script_helper, is_android import tempfile @@ -19,6 +20,10 @@ TIMEOUT = 0.5 MS_WINDOWS = (os.name == 'nt') +MEMORY_SANITIZER = ( + sysconfig.get_config_var("CONFIG_ARGS") and + ("--with-memory-sanitizer" in sysconfig.get_config_var("CONFIG_ARGS")) +) def expected_traceback(lineno1, lineno2, header, min_count=1): regex = header @@ -252,6 +257,8 @@ def test_gil_released(self): 3, 'Segmentation fault') + @unittest.skipIf(MEMORY_SANITIZER, + "memory-sanizer builds change crashing process output.") @skip_segfault_on_android def test_enable_file(self): with temporary_filename() as filename: @@ -267,6 +274,8 @@ def test_enable_file(self): @unittest.skipIf(sys.platform == "win32", "subprocess doesn't support pass_fds on Windows") + @unittest.skipIf(MEMORY_SANITIZER, + "memory-sanizer builds change crashing process output.") @skip_segfault_on_android def test_enable_fd(self): with tempfile.TemporaryFile('wb+') as fp: diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst b/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst new file mode 100644 index 000000000000..d2e5457842b7 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst @@ -0,0 +1,2 @@ +clang Memory Sanitizer build instrumentation was added to work around false +positives from socket, time, and test_faulthandler. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index e6d3f8be6ede..661e1bdf5784 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -100,6 +100,10 @@ Local naming conventions: #include "Python.h" #include "structmember.h" +#ifdef _Py_MEMORY_SANITIZER +# include <sanitizer/msan_interface.h> +#endif + /* Socket object documentation */ PyDoc_STRVAR(sock_doc, "socket(family=AF_INET, type=SOCK_STREAM, proto=0) -> socket object\n\ @@ -6463,7 +6467,23 @@ socket_if_nameindex(PyObject *self, PyObject *arg) return NULL; } +#ifdef _Py_MEMORY_SANITIZER + __msan_unpoison(ni, sizeof(ni)); + __msan_unpoison(&ni[0], sizeof(ni[0])); +#endif for (i = 0; ni[i].if_index != 0 && i < INT_MAX; i++) { +#ifdef _Py_MEMORY_SANITIZER + /* This one isn't the end sentinel, the next one must exist. */ + __msan_unpoison(&ni[i+1], sizeof(ni[0])); + /* Otherwise Py_BuildValue internals are flagged by MSan when + they access the not-msan-tracked if_name string data. */ + { + char *to_sanitize = ni[i].if_name; + do { + __msan_unpoison(to_sanitize, 1); + } while (*to_sanitize++ != '\0'); + } +#endif PyObject *ni_tuple = Py_BuildValue("IO&", ni[i].if_index, PyUnicode_DecodeFSDefault, ni[i].if_name); diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 13a174a4ea87..5e99bd82d1de 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -34,6 +34,10 @@ #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ +#ifdef _Py_MEMORY_SANITIZER +# include <sanitizer/msan_interface.h> +#endif + #define SEC_TO_NS (1000 * 1000 * 1000) /* Forward declarations */ @@ -331,6 +335,9 @@ time_pthread_getcpuclockid(PyObject *self, PyObject *args) PyErr_SetFromErrno(PyExc_OSError); return NULL; } +#ifdef _Py_MEMORY_SANITIZER + __msan_unpoison(&clk_id, sizeof(clk_id)); +#endif return PyLong_FromLong(clk_id); }

1 0

Dead code removal from _hashopenssl. (GH-11379)
by Gregory P. Smith Dec. 31, 2018

Dec. 31, 2018

https://github.com/python/cpython/commit/c7e219132aff1e21cb9ccb0a9b570dc6c7… commit: c7e219132aff1e21cb9ccb0a9b570dc6c750039b branch: master author: Gregory P. Smith <greg(a)krypto.org> committer: GitHub <noreply(a)github.com> date: 2018-12-30T17:54:53-08:00 summary: Dead code removal from _hashopenssl. (GH-11379) HASH_OBJ_CONSTRUCTOR has always been defined as 0 since I created hashlib in Python 2.5. Delete all code associated with it. files: M Modules/_hashopenssl.c M Modules/clinic/_hashopenssl.c.h diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 6da057acd21f..9091025761b9 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -28,10 +28,6 @@ #define MUNCH_SIZE INT_MAX -#ifndef HASH_OBJ_CONSTRUCTOR -#define HASH_OBJ_CONSTRUCTOR 0 -#endif - #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) /* OpenSSL < 1.1.0 */ #define EVP_MD_CTX_new EVP_MD_CTX_create @@ -345,76 +341,23 @@ EVP_repr(EVPobject *self) return PyUnicode_FromFormat("<%U HASH object @ %p>", self->name, self); } -/*[clinic input] -_hashlib.HASH.__init__ as EVP_tp_init - - name as name_obj: object - string as data_obj: object(py_default="b''") = NULL - -A hash is an object used to calculate a checksum of a string of information. - -Methods: - -update() -- updates the current digest with an additional string -digest() -- return the current digest value -hexdigest() -- return the current digest as a string of hexadecimal digits -copy() -- return a copy of the current hash object - -Attributes: - -name -- the hash algorithm being used by this object -digest_size -- number of bytes in this hashes output -[clinic start generated code]*/ - -static int -EVP_tp_init_impl(EVPobject *self, PyObject *name_obj, PyObject *data_obj) -/*[clinic end generated code: output=44766d27757cf851 input=dac22658387f9b5d]*/ -{ - Py_buffer view; - char *nameStr; - const EVP_MD *digest; - - if (data_obj) - GET_BUFFER_VIEW_OR_ERROR(data_obj, &view, return -1); - - if (!PyArg_Parse(name_obj, "s", &nameStr)) { - PyErr_SetString(PyExc_TypeError, "name must be a string"); - if (data_obj) - PyBuffer_Release(&view); - return -1; - } - - digest = EVP_get_digestbyname(nameStr); - if (!digest) { - PyErr_SetString(PyExc_ValueError, "unknown hash function"); - if (data_obj) - PyBuffer_Release(&view); - return -1; - } - if (!EVP_DigestInit(self->ctx, digest)) { - _setException(PyExc_ValueError); - if (data_obj) - PyBuffer_Release(&view); - return -1; - } - - Py_INCREF(name_obj); - Py_XSETREF(self->name, name_obj); - - if (data_obj) { - if (view.len >= HASHLIB_GIL_MINSIZE) { - Py_BEGIN_ALLOW_THREADS - EVP_hash(self, view.buf, view.len); - Py_END_ALLOW_THREADS - } else { - EVP_hash(self, view.buf, view.len); - } - PyBuffer_Release(&view); - } - - return 0; -} - +PyDoc_STRVAR(hashtype_doc, +"HASH(name, string=b\'\')\n" +"--\n" +"\n" +"A hash is an object used to calculate a checksum of a string of information.\n" +"\n" +"Methods:\n" +"\n" +"update() -- updates the current digest with an additional string\n" +"digest() -- return the current digest value\n" +"hexdigest() -- return the current digest as a string of hexadecimal digits\n" +"copy() -- return a copy of the current hash object\n" +"\n" +"Attributes:\n" +"\n" +"name -- the hash algorithm being used by this object\n" +"digest_size -- number of bytes in this hashes output"); static PyTypeObject EVPtype = { PyVarObject_HEAD_INIT(NULL, 0) @@ -438,7 +381,7 @@ static PyTypeObject EVPtype = { 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - EVP_tp_init__doc__, /*tp_doc*/ + hashtype_doc, /*tp_doc*/ 0, /*tp_traverse*/ 0, /*tp_clear*/ 0, /*tp_richcompare*/ @@ -448,16 +391,11 @@ static PyTypeObject EVPtype = { EVP_methods, /* tp_methods */ EVP_members, /* tp_members */ EVP_getseters, /* tp_getset */ -#if 1 0, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ -#endif -#if HASH_OBJ_CONSTRUCTOR - (initproc)EVP_tp_init, /* tp_init */ -#endif }; static PyObject * diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index 5f2b23560ef1..43f965124508 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -65,46 +65,6 @@ PyDoc_STRVAR(EVP_update__doc__, #define EVP_UPDATE_METHODDEF \ {"update", (PyCFunction)EVP_update, METH_O, EVP_update__doc__}, -PyDoc_STRVAR(EVP_tp_init__doc__, -"HASH(name, string=b\'\')\n" -"--\n" -"\n" -"A hash is an object used to calculate a checksum of a string of information.\n" -"\n" -"Methods:\n" -"\n" -"update() -- updates the current digest with an additional string\n" -"digest() -- return the current digest value\n" -"hexdigest() -- return the current digest as a string of hexadecimal digits\n" -"copy() -- return a copy of the current hash object\n" -"\n" -"Attributes:\n" -"\n" -"name -- the hash algorithm being used by this object\n" -"digest_size -- number of bytes in this hashes output"); - -static int -EVP_tp_init_impl(EVPobject *self, PyObject *name_obj, PyObject *data_obj); - -static int -EVP_tp_init(PyObject *self, PyObject *args, PyObject *kwargs) -{ - int return_value = -1; - static const char * const _keywords[] = {"name", "string", NULL}; - static _PyArg_Parser _parser = {"O|O:HASH", _keywords, 0}; - PyObject *name_obj; - PyObject *data_obj = NULL; - - if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, - &name_obj, &data_obj)) { - goto exit; - } - return_value = EVP_tp_init_impl((EVPobject *)self, name_obj, data_obj); - -exit: - return return_value; -} - PyDoc_STRVAR(EVP_new__doc__, "new($module, /, name, string=b\'\')\n" "--\n" @@ -292,4 +252,4 @@ _hashlib_hmac_digest(PyObject *module, PyObject *const *args, Py_ssize_t nargs, #ifndef _HASHLIB_SCRYPT_METHODDEF #define _HASHLIB_SCRYPT_METHODDEF #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ -/*[clinic end generated code: output=cae09468e2cdbefe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fe5931d2b301ca12 input=a9049054013a1b77]*/

1 0

bpo-35214: MSan workarounds for socket, time, and test_faulthandler. (GH-11375)
by Gregory P. Smith Dec. 31, 2018

Dec. 31, 2018

https://github.com/python/cpython/commit/b474e6774d60fa67d5373e361a0ed53c18… commit: b474e6774d60fa67d5373e361a0ed53c18b24f53 branch: master author: Gregory P. Smith <greg(a)krypto.org> committer: GitHub <noreply(a)github.com> date: 2018-12-30T17:05:36-08:00 summary: bpo-35214: MSan workarounds for socket, time, and test_faulthandler. (GH-11375) Add Clang Memory Sanitizer build instrumentation to work around false positives from the socket and time modules as well as skipping a couple test_faulthandler tests. files: A Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst M Lib/test/test_faulthandler.py M Modules/socketmodule.c M Modules/timemodule.c diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index 59289d026e39..76dd6ab06805 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -5,6 +5,7 @@ import signal import subprocess import sys +import sysconfig from test import support from test.support import script_helper, is_android import tempfile @@ -19,6 +20,10 @@ TIMEOUT = 0.5 MS_WINDOWS = (os.name == 'nt') +MEMORY_SANITIZER = ( + sysconfig.get_config_var("CONFIG_ARGS") and + ("--with-memory-sanitizer" in sysconfig.get_config_var("CONFIG_ARGS")) +) def expected_traceback(lineno1, lineno2, header, min_count=1): regex = header @@ -252,6 +257,8 @@ def test_gil_released(self): 3, 'Segmentation fault') + @unittest.skipIf(MEMORY_SANITIZER, + "memory-sanizer builds change crashing process output.") @skip_segfault_on_android def test_enable_file(self): with temporary_filename() as filename: @@ -267,6 +274,8 @@ def test_enable_file(self): @unittest.skipIf(sys.platform == "win32", "subprocess doesn't support pass_fds on Windows") + @unittest.skipIf(MEMORY_SANITIZER, + "memory-sanizer builds change crashing process output.") @skip_segfault_on_android def test_enable_fd(self): with tempfile.TemporaryFile('wb+') as fp: diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst b/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst new file mode 100644 index 000000000000..d2e5457842b7 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-12-30-15-36-23.bpo-35214.GWDQcv.rst @@ -0,0 +1,2 @@ +clang Memory Sanitizer build instrumentation was added to work around false +positives from socket, time, and test_faulthandler. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 66e52f84eb91..0ae280f29881 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -102,6 +102,10 @@ Local naming conventions: #include "Python.h" #include "structmember.h" +#ifdef _Py_MEMORY_SANITIZER +# include <sanitizer/msan_interface.h> +#endif + /* Socket object documentation */ PyDoc_STRVAR(sock_doc, "socket(family=AF_INET, type=SOCK_STREAM, proto=0) -> socket object\n\ @@ -6571,7 +6575,23 @@ socket_if_nameindex(PyObject *self, PyObject *arg) return NULL; } +#ifdef _Py_MEMORY_SANITIZER + __msan_unpoison(ni, sizeof(ni)); + __msan_unpoison(&ni[0], sizeof(ni[0])); +#endif for (i = 0; ni[i].if_index != 0 && i < INT_MAX; i++) { +#ifdef _Py_MEMORY_SANITIZER + /* This one isn't the end sentinel, the next one must exist. */ + __msan_unpoison(&ni[i+1], sizeof(ni[0])); + /* Otherwise Py_BuildValue internals are flagged by MSan when + they access the not-msan-tracked if_name string data. */ + { + char *to_sanitize = ni[i].if_name; + do { + __msan_unpoison(to_sanitize, 1); + } while (*to_sanitize++ != '\0'); + } +#endif PyObject *ni_tuple = Py_BuildValue("IO&", ni[i].if_index, PyUnicode_DecodeFSDefault, ni[i].if_name); diff --git a/Modules/timemodule.c b/Modules/timemodule.c index cf6522927ada..43951d5623d3 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -34,6 +34,10 @@ #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ +#ifdef _Py_MEMORY_SANITIZER +# include <sanitizer/msan_interface.h> +#endif + #define SEC_TO_NS (1000 * 1000 * 1000) /* Forward declarations */ @@ -336,6 +340,9 @@ time_pthread_getcpuclockid(PyObject *self, PyObject *args) PyErr_SetFromErrno(PyExc_OSError); return NULL; } +#ifdef _Py_MEMORY_SANITIZER + __msan_unpoison(&clk_id, sizeof(clk_id)); +#endif return PyLong_FromLong(clk_id); }

1 0

bpo-28503: Use crypt_r() when available instead of crypt() (GH-11373)
by Gregory P. Smith Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/387512c7ecde6446f2e29408af2e16b9fc… commit: 387512c7ecde6446f2e29408af2e16b9fc043807 branch: master author: Gregory P. Smith <greg(a)krypto.org> committer: GitHub <noreply(a)github.com> date: 2018-12-30T15:42:32-08:00 summary: bpo-28503: Use crypt_r() when available instead of crypt() (GH-11373) Use crypt_r() when available instead of crypt() in the crypt module. As a nice side effect: This also avoids a memory sanitizer flake as clang msan doesn't know about crypt's internal libc allocated buffer. files: A Misc/NEWS.d/next/Library/2018-12-30-14-56-33.bpo-28503.V4kNN3.rst M Include/Python.h M Modules/_cryptmodule.c M configure M configure.ac M pyconfig.h.in diff --git a/Include/Python.h b/Include/Python.h index cb24c8d33ee6..aa60175f5235 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -36,7 +36,17 @@ #include <unistd.h> #endif #ifdef HAVE_CRYPT_H +#if defined(HAVE_CRYPT_R) && !defined(_GNU_SOURCE) +/* Required for glibc to expose the crypt_r() function prototype. */ +# define _GNU_SOURCE +# define _Py_GNU_SOURCE_FOR_CRYPT +#endif #include <crypt.h> +#ifdef _Py_GNU_SOURCE_FOR_CRYPT +/* Don't leak the _GNU_SOURCE define to other headers. */ +# undef _GNU_SOURCE +# undef _Py_GNU_SOURCE_FOR_CRYPT +#endif #endif /* For size_t? */ diff --git a/Misc/NEWS.d/next/Library/2018-12-30-14-56-33.bpo-28503.V4kNN3.rst b/Misc/NEWS.d/next/Library/2018-12-30-14-56-33.bpo-28503.V4kNN3.rst new file mode 100644 index 000000000000..651fef1f0371 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-12-30-14-56-33.bpo-28503.V4kNN3.rst @@ -0,0 +1,2 @@ +The `crypt` module now internally uses the `crypt_r()` library function +instead of `crypt()` when available. diff --git a/Modules/_cryptmodule.c b/Modules/_cryptmodule.c index 58d179e6a3d2..5d03f45f6436 100644 --- a/Modules/_cryptmodule.c +++ b/Modules/_cryptmodule.c @@ -34,7 +34,15 @@ static PyObject * crypt_crypt_impl(PyObject *module, const char *word, const char *salt) /*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/ { - return Py_BuildValue("s", crypt(word, salt)); + char *crypt_result; +#ifdef HAVE_CRYPT_R + struct crypt_data data; + memset(&data, 0, sizeof(data)); + crypt_result = crypt_r(word, salt, &data); +#else + crypt_result = crypt(word, salt); +#endif + return Py_BuildValue("s", crypt_result); } diff --git a/configure b/configure index edb85b524f54..13677b9d96b6 100755 --- a/configure +++ b/configure @@ -12677,6 +12677,150 @@ fi done +# We search for both crypt and crypt_r as one or the other may be defined +# This gets us our -lcrypt in LIBS when required on the target platform. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 +$as_echo_n "checking for library containing crypt... " >&6; } +if ${ac_cv_search_crypt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (); +int +main () +{ +return crypt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' crypt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_crypt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_crypt+:} false; then : + break +fi +done +if ${ac_cv_search_crypt+:} false; then : + +else + ac_cv_search_crypt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 +$as_echo "$ac_cv_search_crypt" >&6; } +ac_res=$ac_cv_search_crypt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5 +$as_echo_n "checking for library containing crypt_r... " >&6; } +if ${ac_cv_search_crypt_r+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt_r (); +int +main () +{ +return crypt_r (); + ; + return 0; +} +_ACEOF +for ac_lib in '' crypt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_crypt_r=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_crypt_r+:} false; then : + break +fi +done +if ${ac_cv_search_crypt_r+:} false; then : + +else + ac_cv_search_crypt_r=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5 +$as_echo "$ac_cv_search_crypt_r" >&6; } +ac_res=$ac_cv_search_crypt_r +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r" +if test "x$ac_cv_func_crypt_r" = xyes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _GNU_SOURCE /* Required for crypt_r()'s prototype in glibc. */ +#include <crypt.h> + +int +main () +{ + +struct crypt_data d; +char *r = crypt_r("", "", &d); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + + for ac_func in clock_gettime do : ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" diff --git a/configure.ac b/configure.ac index 349c927484cd..bd09a9c9e1e0 100644 --- a/configure.ac +++ b/configure.ac @@ -3818,6 +3818,23 @@ AC_CHECK_FUNCS(gettimeofday, ]) ) +# We search for both crypt and crypt_r as one or the other may be defined +# This gets us our -lcrypt in LIBS when required on the target platform. +AC_SEARCH_LIBS(crypt, crypt) +AC_SEARCH_LIBS(crypt_r, crypt) + +AC_CHECK_FUNC(crypt_r, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#define _GNU_SOURCE /* Required for crypt_r()'s prototype in glibc. */ +#include <crypt.h> +]], [[ +struct crypt_data d; +char *r = crypt_r("", "", &d); +]])], + [AC_DEFINE(HAVE_CRYPT_R, 1, [Define if you have the crypt_r() function.])], + []) +) + AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ LIBS="$LIBS -lrt" diff --git a/pyconfig.h.in b/pyconfig.h.in index 254a2dcab4da..f37ca3615025 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -147,6 +147,9 @@ /* Define to 1 if you have the <crypt.h> header file. */ #undef HAVE_CRYPT_H +/* Define if you have the crypt_r() function. */ +#undef HAVE_CRYPT_R + /* Define to 1 if you have the `ctermid' function. */ #undef HAVE_CTERMID

1 0

Fix typo in documentation of AbstractEventLoopPolicy.set_child_watcher() (GH-11369)
by Miss Islington (bot) Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/c74061d49b2b8275b376e212cccf2922d0… commit: c74061d49b2b8275b376e212cccf2922d022e607 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-30T14:07:05-08:00 summary: Fix typo in documentation of AbstractEventLoopPolicy.set_child_watcher() (GH-11369) `set_child_watcher()` *sets* the watcher. (cherry picked from commit 1b29c03c95dbffa05f2bac0f8f1a36b21606a504) Co-authored-by: sth <sth.dev(a)tejp.de> files: M Doc/library/asyncio-policy.rst diff --git a/Doc/library/asyncio-policy.rst b/Doc/library/asyncio-policy.rst index cab25934d782..07842daa28b8 100644 --- a/Doc/library/asyncio-policy.rst +++ b/Doc/library/asyncio-policy.rst @@ -81,7 +81,7 @@ The abstract event loop policy base class is defined as follows: .. method:: set_child_watcher(watcher) - Get the current child process watcher to *watcher*. + Set the current child process watcher to *watcher*. This function is Unix specific.

1 0

Fix typo in documentation of AbstractEventLoopPolicy.set_child_watcher() (GH-11369)
by Miss Islington (bot) Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/1b29c03c95dbffa05f2bac0f8f1a36b216… commit: 1b29c03c95dbffa05f2bac0f8f1a36b21606a504 branch: master author: sth <sth.dev(a)tejp.de> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2018-12-30T14:01:28-08:00 summary: Fix typo in documentation of AbstractEventLoopPolicy.set_child_watcher() (GH-11369) `set_child_watcher()` *sets* the watcher. files: M Doc/library/asyncio-policy.rst diff --git a/Doc/library/asyncio-policy.rst b/Doc/library/asyncio-policy.rst index 82c83822d4d3..6212df85dbc1 100644 --- a/Doc/library/asyncio-policy.rst +++ b/Doc/library/asyncio-policy.rst @@ -81,7 +81,7 @@ The abstract event loop policy base class is defined as follows: .. method:: set_child_watcher(watcher) - Get the current child process watcher to *watcher*. + Set the current child process watcher to *watcher*. This function is Unix specific.

1 0

bpo-35598: IDLE: Switch config_key dialog to ttk widgets (GH-11365)
by Miss Islington (bot) Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/d2694d47682b84dafef1c172ede7ad16d3… commit: d2694d47682b84dafef1c172ede7ad16d3b8bbd8 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-12-30T12:30:09-08:00 summary: bpo-35598: IDLE: Switch config_key dialog to ttk widgets (GH-11365) (cherry picked from commit 4bd79c38efe3cc0a3c724605cf9474e2d1b6b6e2) Co-authored-by: Cheryl Sabella <cheryl.sabella(a)gmail.com> files: M Lib/idlelib/config_key.py M Lib/idlelib/idle_test/test_config_key.py M Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 4e7b38b75a1d..466830566042 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -1,8 +1,8 @@ """ Dialog for building Tkinter accelerator key bindings """ -from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter import Toplevel, Listbox, Text, StringVar, TclError +from tkinter.ttk import Button, Checkbutton, Entry, Frame, Label, Scrollbar from tkinter import messagebox import string import sys @@ -67,11 +67,11 @@ def showerror(self, *args, **kwargs): messagebox.showerror(*args, **kwargs) def create_widgets(self): - self.frame = frame = Frame(self, borderwidth=2, relief=SUNKEN) - frame.pack(side=TOP, expand=True, fill=BOTH) + self.frame = frame = Frame(self, borderwidth=2, relief='sunken') + frame.pack(side='top', expand=True, fill='both') frame_buttons = Frame(self) - frame_buttons.pack(side=BOTTOM, fill=X) + frame_buttons.pack(side='bottom', fill='x') self.button_ok = Button(frame_buttons, text='OK', width=8, command=self.ok) @@ -82,20 +82,20 @@ def create_widgets(self): # Basic entry key sequence. self.frame_keyseq_basic = Frame(frame, name='keyseq_basic') - self.frame_keyseq_basic.grid(row=0, column=0, sticky=NSEW, + self.frame_keyseq_basic.grid(row=0, column=0, sticky='nsew', padx=5, pady=5) basic_title = Label(self.frame_keyseq_basic, text=f"New keys for '{self.action}' :") - basic_title.pack(anchor=W) + basic_title.pack(anchor='w') - basic_keys = Label(self.frame_keyseq_basic, justify=LEFT, - textvariable=self.key_string, relief=GROOVE, + basic_keys = Label(self.frame_keyseq_basic, justify='left', + textvariable=self.key_string, relief='groove', borderwidth=2) - basic_keys.pack(ipadx=5, ipady=5, fill=X) + basic_keys.pack(ipadx=5, ipady=5, fill='x') # Basic entry controls. self.frame_controls_basic = Frame(frame) - self.frame_controls_basic.grid(row=1, column=0, sticky=NSEW, padx=5) + self.frame_controls_basic.grid(row=1, column=0, sticky='nsew', padx=5) # Basic entry modifiers. self.modifier_checkbuttons = {} @@ -105,30 +105,30 @@ def create_widgets(self): check = Checkbutton(self.frame_controls_basic, command=self.build_key_string, text=label, variable=variable, onvalue=modifier, offvalue='') - check.grid(row=0, column=column, padx=2, sticky=W) + check.grid(row=0, column=column, padx=2, sticky='w') self.modifier_checkbuttons[modifier] = check column += 1 # Basic entry help text. - help_basic = Label(self.frame_controls_basic, justify=LEFT, + help_basic = Label(self.frame_controls_basic, justify='left', text="Select the desired modifier keys\n"+ "above, and the final key from the\n"+ "list on the right.\n\n" + "Use upper case Symbols when using\n" + "the Shift modifier. (Letters will be\n" + "converted automatically.)") - help_basic.grid(row=1, column=0, columnspan=4, padx=2, sticky=W) + help_basic.grid(row=1, column=0, columnspan=4, padx=2, sticky='w') # Basic entry key list. self.list_keys_final = Listbox(self.frame_controls_basic, width=15, - height=10, selectmode=SINGLE) + height=10, selectmode='single') self.list_keys_final.bind('<ButtonRelease-1>', self.final_key_selected) - self.list_keys_final.grid(row=0, column=4, rowspan=4, sticky=NS) + self.list_keys_final.grid(row=0, column=4, rowspan=4, sticky='ns') scroll_keys_final = Scrollbar(self.frame_controls_basic, - orient=VERTICAL, + orient='vertical', command=self.list_keys_final.yview) self.list_keys_final.config(yscrollcommand=scroll_keys_final.set) - scroll_keys_final.grid(row=0, column=5, rowspan=4, sticky=NS) + scroll_keys_final.grid(row=0, column=5, rowspan=4, sticky='ns') self.button_clear = Button(self.frame_controls_basic, text='Clear Keys', command=self.clear_key_seq) @@ -136,20 +136,20 @@ def create_widgets(self): # Advanced entry key sequence. self.frame_keyseq_advanced = Frame(frame, name='keyseq_advanced') - self.frame_keyseq_advanced.grid(row=0, column=0, sticky=NSEW, + self.frame_keyseq_advanced.grid(row=0, column=0, sticky='nsew', padx=5, pady=5) - advanced_title = Label(self.frame_keyseq_advanced, justify=LEFT, + advanced_title = Label(self.frame_keyseq_advanced, justify='left', text=f"Enter new binding(s) for '{self.action}' :\n" + "(These bindings will not be checked for validity!)") - advanced_title.pack(anchor=W) + advanced_title.pack(anchor='w') self.advanced_keys = Entry(self.frame_keyseq_advanced, textvariable=self.key_string) - self.advanced_keys.pack(fill=X) + self.advanced_keys.pack(fill='x') # Advanced entry help text. self.frame_help_advanced = Frame(frame) - self.frame_help_advanced.grid(row=1, column=0, sticky=NSEW, padx=5) - help_advanced = Label(self.frame_help_advanced, justify=LEFT, + self.frame_help_advanced.grid(row=1, column=0, sticky='nsew', padx=5) + help_advanced = Label(self.frame_help_advanced, justify='left', text="Key bindings are specified using Tkinter keysyms as\n"+ "in these samples: <Control-f>, <Shift-F2>, <F12>,\n" "<Control-space>, <Meta-less>, <Control-Alt-Shift-X>.\n" @@ -159,12 +159,12 @@ def create_widgets(self): "is the 'do-nothing' keybinding.\n\n" + "Multiple separate bindings for one action should be\n"+ "separated by a space, eg., <Alt-v> <Meta-v>." ) - help_advanced.grid(row=0, column=0, sticky=NSEW) + help_advanced.grid(row=0, column=0, sticky='nsew') # Switch between basic and advanced. self.button_level = Button(frame, command=self.toggle_level, text='<< Basic Key Binding Entry') - self.button_level.grid(row=2, column=0, stick=EW, padx=5, pady=5) + self.button_level.grid(row=2, column=0, stick='ew', padx=5, pady=5) self.toggle_level() def set_modifiers_for_platform(self): @@ -204,7 +204,7 @@ def final_key_selected(self, event=None): def build_key_string(self): "Create formatted string of modifiers plus the key." keylist = modifiers = self.get_modifiers() - final_key = self.list_keys_final.get(ANCHOR) + final_key = self.list_keys_final.get('anchor') if final_key: final_key = self.translate_key(final_key, modifiers) keylist.append(final_key) @@ -217,8 +217,8 @@ def get_modifiers(self): def clear_key_seq(self): "Clear modifiers and keys selection." - self.list_keys_final.select_clear(0, END) - self.list_keys_final.yview(MOVETO, '0.0') + self.list_keys_final.select_clear(0, 'end') + self.list_keys_final.yview('moveto', '0.0') for variable in self.modifier_vars: variable.set('') self.key_string.set('') @@ -237,7 +237,7 @@ def load_final_key_list(self): # Make a tuple of most of the useful common 'final' keys. keys = (self.alphanum_keys + self.punctuation_keys + self.function_keys + self.whitespace_keys + self.edit_keys + self.move_keys) - self.list_keys_final.insert(END, *keys) + self.list_keys_final.insert('end', *keys) @staticmethod def translate_key(key, modifiers): @@ -282,7 +282,7 @@ def keys_ok(self, keys): Doesn't check the string produced by the advanced dialog because 'modifiers' isn't set. """ - final_key = self.list_keys_final.get(ANCHOR) + final_key = self.list_keys_final.get('anchor') modifiers = self.get_modifiers() title = self.keyerror_title key_sequences = [key for keylist in self.current_key_sequences diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py index 9412b22c2c87..8261f8da00c3 100644 --- a/Lib/idlelib/idle_test/test_config_key.py +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -196,14 +196,14 @@ def test_get_modifiers(self): gm = dialog.get_modifiers eq = self.assertEqual - # Modifiers are set by selecting/deselecting the checkbutton. - dialog.modifier_checkbuttons['foo'].select() + # Modifiers are set on/off by invoking the checkbutton. + dialog.modifier_checkbuttons['foo'].invoke() eq(gm(), ['foo']) - dialog.modifier_checkbuttons['BAZ'].select() + dialog.modifier_checkbuttons['BAZ'].invoke() eq(gm(), ['foo', 'BAZ']) - dialog.modifier_checkbuttons['foo'].deselect() + dialog.modifier_checkbuttons['foo'].invoke() eq(gm(), ['BAZ']) def test_translate_key(self): diff --git a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst index 6cc3557b5190..e20b01d991c4 100644 --- a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst +++ b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst @@ -1 +1 @@ -Update config_key: use PEP 8 names and add tests. +Update config_key: use PEP 8 names, ttk widgets, and add tests.

1 0

bpo-35598: IDLE: Switch config_key dialog to ttk widgets (GH-11365)
by Terry Jan Reedy Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/4bd79c38efe3cc0a3c724605cf9474e2d1… commit: 4bd79c38efe3cc0a3c724605cf9474e2d1b6b6e2 branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: Terry Jan Reedy <tjreedy(a)udel.edu> date: 2018-12-30T14:48:51-05:00 summary: bpo-35598: IDLE: Switch config_key dialog to ttk widgets (GH-11365) files: M Lib/idlelib/config_key.py M Lib/idlelib/idle_test/test_config_key.py M Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py index 4e7b38b75a1d..466830566042 100644 --- a/Lib/idlelib/config_key.py +++ b/Lib/idlelib/config_key.py @@ -1,8 +1,8 @@ """ Dialog for building Tkinter accelerator key bindings """ -from tkinter import * -from tkinter.ttk import Scrollbar +from tkinter import Toplevel, Listbox, Text, StringVar, TclError +from tkinter.ttk import Button, Checkbutton, Entry, Frame, Label, Scrollbar from tkinter import messagebox import string import sys @@ -67,11 +67,11 @@ def showerror(self, *args, **kwargs): messagebox.showerror(*args, **kwargs) def create_widgets(self): - self.frame = frame = Frame(self, borderwidth=2, relief=SUNKEN) - frame.pack(side=TOP, expand=True, fill=BOTH) + self.frame = frame = Frame(self, borderwidth=2, relief='sunken') + frame.pack(side='top', expand=True, fill='both') frame_buttons = Frame(self) - frame_buttons.pack(side=BOTTOM, fill=X) + frame_buttons.pack(side='bottom', fill='x') self.button_ok = Button(frame_buttons, text='OK', width=8, command=self.ok) @@ -82,20 +82,20 @@ def create_widgets(self): # Basic entry key sequence. self.frame_keyseq_basic = Frame(frame, name='keyseq_basic') - self.frame_keyseq_basic.grid(row=0, column=0, sticky=NSEW, + self.frame_keyseq_basic.grid(row=0, column=0, sticky='nsew', padx=5, pady=5) basic_title = Label(self.frame_keyseq_basic, text=f"New keys for '{self.action}' :") - basic_title.pack(anchor=W) + basic_title.pack(anchor='w') - basic_keys = Label(self.frame_keyseq_basic, justify=LEFT, - textvariable=self.key_string, relief=GROOVE, + basic_keys = Label(self.frame_keyseq_basic, justify='left', + textvariable=self.key_string, relief='groove', borderwidth=2) - basic_keys.pack(ipadx=5, ipady=5, fill=X) + basic_keys.pack(ipadx=5, ipady=5, fill='x') # Basic entry controls. self.frame_controls_basic = Frame(frame) - self.frame_controls_basic.grid(row=1, column=0, sticky=NSEW, padx=5) + self.frame_controls_basic.grid(row=1, column=0, sticky='nsew', padx=5) # Basic entry modifiers. self.modifier_checkbuttons = {} @@ -105,30 +105,30 @@ def create_widgets(self): check = Checkbutton(self.frame_controls_basic, command=self.build_key_string, text=label, variable=variable, onvalue=modifier, offvalue='') - check.grid(row=0, column=column, padx=2, sticky=W) + check.grid(row=0, column=column, padx=2, sticky='w') self.modifier_checkbuttons[modifier] = check column += 1 # Basic entry help text. - help_basic = Label(self.frame_controls_basic, justify=LEFT, + help_basic = Label(self.frame_controls_basic, justify='left', text="Select the desired modifier keys\n"+ "above, and the final key from the\n"+ "list on the right.\n\n" + "Use upper case Symbols when using\n" + "the Shift modifier. (Letters will be\n" + "converted automatically.)") - help_basic.grid(row=1, column=0, columnspan=4, padx=2, sticky=W) + help_basic.grid(row=1, column=0, columnspan=4, padx=2, sticky='w') # Basic entry key list. self.list_keys_final = Listbox(self.frame_controls_basic, width=15, - height=10, selectmode=SINGLE) + height=10, selectmode='single') self.list_keys_final.bind('<ButtonRelease-1>', self.final_key_selected) - self.list_keys_final.grid(row=0, column=4, rowspan=4, sticky=NS) + self.list_keys_final.grid(row=0, column=4, rowspan=4, sticky='ns') scroll_keys_final = Scrollbar(self.frame_controls_basic, - orient=VERTICAL, + orient='vertical', command=self.list_keys_final.yview) self.list_keys_final.config(yscrollcommand=scroll_keys_final.set) - scroll_keys_final.grid(row=0, column=5, rowspan=4, sticky=NS) + scroll_keys_final.grid(row=0, column=5, rowspan=4, sticky='ns') self.button_clear = Button(self.frame_controls_basic, text='Clear Keys', command=self.clear_key_seq) @@ -136,20 +136,20 @@ def create_widgets(self): # Advanced entry key sequence. self.frame_keyseq_advanced = Frame(frame, name='keyseq_advanced') - self.frame_keyseq_advanced.grid(row=0, column=0, sticky=NSEW, + self.frame_keyseq_advanced.grid(row=0, column=0, sticky='nsew', padx=5, pady=5) - advanced_title = Label(self.frame_keyseq_advanced, justify=LEFT, + advanced_title = Label(self.frame_keyseq_advanced, justify='left', text=f"Enter new binding(s) for '{self.action}' :\n" + "(These bindings will not be checked for validity!)") - advanced_title.pack(anchor=W) + advanced_title.pack(anchor='w') self.advanced_keys = Entry(self.frame_keyseq_advanced, textvariable=self.key_string) - self.advanced_keys.pack(fill=X) + self.advanced_keys.pack(fill='x') # Advanced entry help text. self.frame_help_advanced = Frame(frame) - self.frame_help_advanced.grid(row=1, column=0, sticky=NSEW, padx=5) - help_advanced = Label(self.frame_help_advanced, justify=LEFT, + self.frame_help_advanced.grid(row=1, column=0, sticky='nsew', padx=5) + help_advanced = Label(self.frame_help_advanced, justify='left', text="Key bindings are specified using Tkinter keysyms as\n"+ "in these samples: <Control-f>, <Shift-F2>, <F12>,\n" "<Control-space>, <Meta-less>, <Control-Alt-Shift-X>.\n" @@ -159,12 +159,12 @@ def create_widgets(self): "is the 'do-nothing' keybinding.\n\n" + "Multiple separate bindings for one action should be\n"+ "separated by a space, eg., <Alt-v> <Meta-v>." ) - help_advanced.grid(row=0, column=0, sticky=NSEW) + help_advanced.grid(row=0, column=0, sticky='nsew') # Switch between basic and advanced. self.button_level = Button(frame, command=self.toggle_level, text='<< Basic Key Binding Entry') - self.button_level.grid(row=2, column=0, stick=EW, padx=5, pady=5) + self.button_level.grid(row=2, column=0, stick='ew', padx=5, pady=5) self.toggle_level() def set_modifiers_for_platform(self): @@ -204,7 +204,7 @@ def final_key_selected(self, event=None): def build_key_string(self): "Create formatted string of modifiers plus the key." keylist = modifiers = self.get_modifiers() - final_key = self.list_keys_final.get(ANCHOR) + final_key = self.list_keys_final.get('anchor') if final_key: final_key = self.translate_key(final_key, modifiers) keylist.append(final_key) @@ -217,8 +217,8 @@ def get_modifiers(self): def clear_key_seq(self): "Clear modifiers and keys selection." - self.list_keys_final.select_clear(0, END) - self.list_keys_final.yview(MOVETO, '0.0') + self.list_keys_final.select_clear(0, 'end') + self.list_keys_final.yview('moveto', '0.0') for variable in self.modifier_vars: variable.set('') self.key_string.set('') @@ -237,7 +237,7 @@ def load_final_key_list(self): # Make a tuple of most of the useful common 'final' keys. keys = (self.alphanum_keys + self.punctuation_keys + self.function_keys + self.whitespace_keys + self.edit_keys + self.move_keys) - self.list_keys_final.insert(END, *keys) + self.list_keys_final.insert('end', *keys) @staticmethod def translate_key(key, modifiers): @@ -282,7 +282,7 @@ def keys_ok(self, keys): Doesn't check the string produced by the advanced dialog because 'modifiers' isn't set. """ - final_key = self.list_keys_final.get(ANCHOR) + final_key = self.list_keys_final.get('anchor') modifiers = self.get_modifiers() title = self.keyerror_title key_sequences = [key for keylist in self.current_key_sequences diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py index 9412b22c2c87..8261f8da00c3 100644 --- a/Lib/idlelib/idle_test/test_config_key.py +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -196,14 +196,14 @@ def test_get_modifiers(self): gm = dialog.get_modifiers eq = self.assertEqual - # Modifiers are set by selecting/deselecting the checkbutton. - dialog.modifier_checkbuttons['foo'].select() + # Modifiers are set on/off by invoking the checkbutton. + dialog.modifier_checkbuttons['foo'].invoke() eq(gm(), ['foo']) - dialog.modifier_checkbuttons['BAZ'].select() + dialog.modifier_checkbuttons['BAZ'].invoke() eq(gm(), ['foo', 'BAZ']) - dialog.modifier_checkbuttons['foo'].deselect() + dialog.modifier_checkbuttons['foo'].invoke() eq(gm(), ['BAZ']) def test_translate_key(self): diff --git a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst index 6cc3557b5190..e20b01d991c4 100644 --- a/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst +++ b/Misc/NEWS.d/next/IDLE/2018-12-27-15-29-11.bpo-35598.FWOOm8.rst @@ -1 +1 @@ -Update config_key: use PEP 8 names and add tests. +Update config_key: use PEP 8 names, ttk widgets, and add tests.

1 0

bpo-32492: 1.6x speed up in namedtuple attribute access using C fast-path (#10495)
by Raymond Hettinger Dec. 30, 2018

Dec. 30, 2018

https://github.com/python/cpython/commit/3f5fc70c6213008243e7d605f7d8a2d8f9… commit: 3f5fc70c6213008243e7d605f7d8a2d8f94cf919 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-12-30T01:24:03-08:00 summary: bpo-32492: 1.6x speed up in namedtuple attribute access using C fast-path (#10495) * bpo-32492: 2.5x speed up in namedtuple attribute access using C fast path * Add News entry * fixup! bpo-32492: 2.5x speed up in namedtuple attribute access using C fast path * Check for tuple in the __get__ of the new descriptor and don't cache the descriptor itself * Don't inherit from property. Implement GC methods to handle __doc__ * Add a test for the docstring substitution in descriptors * Update NEWS entry to reflect time against 3.7 branch * Simplify implementation with argument clinic, better error messages, only __new__ * Use positional-only parameters for the __new__ * Use PyTuple_GET_SIZE and PyTuple_GET_ITEM to tighter the implementation of tuplegetterdescr_get * Implement __set__ to make tuplegetter a data descriptor * Use Py_INCREF now that we inline PyTuple_GetItem * Apply the valid_index() function, saving one test * Move Py_None test out of the critical path. files: A Misc/NEWS.d/next/Core and Builtins/2018-11-13-01-03-10.bpo-32492.voIdcp.rst A Modules/clinic/_collectionsmodule.c.h M Lib/collections/__init__.py M Lib/test/test_collections.py M Modules/_collectionsmodule.c diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 4724b0edf33a..0b74c3f8915f 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -311,6 +311,11 @@ def __eq__(self, other): ### namedtuple ################################################################################ +try: + from _collections import _tuplegetter +except ImportError: + _tuplegetter = lambda index, doc: property(_itemgetter(index), doc=doc) + _nt_itemgetters = {} def namedtuple(typename, field_names, *, rename=False, defaults=None, module=None): @@ -454,12 +459,13 @@ def __getnewargs__(self): cache = _nt_itemgetters for index, name in enumerate(field_names): try: - itemgetter_object, doc = cache[index] + doc = cache[index] except KeyError: - itemgetter_object = _itemgetter(index) doc = f'Alias for field number {index}' - cache[index] = itemgetter_object, doc - class_namespace[name] = property(itemgetter_object, doc=doc) + cache[index] = doc + + tuplegetter_object = _tuplegetter(index, doc) + class_namespace[name] = tuplegetter_object result = type(typename, (tuple,), class_namespace) diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index e2ffaaafd454..c0815947f908 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -514,6 +514,14 @@ class Point(namedtuple('_Point', ['x', 'y'])): a.w = 5 self.assertEqual(a.__dict__, {'w': 5}) + def test_namedtuple_can_mutate_doc_of_descriptors_independently(self): + A = namedtuple('A', 'x y') + B = namedtuple('B', 'x y') + A.x.__doc__ = 'foo' + B.x.__doc__ = 'bar' + self.assertEqual(A.x.__doc__, 'foo') + self.assertEqual(B.x.__doc__, 'bar') + ################################################################################ ### Abstract Base Classes diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-11-13-01-03-10.bpo-32492.voIdcp.rst b/Misc/NEWS.d/next/Core and Builtins/2018-11-13-01-03-10.bpo-32492.voIdcp.rst new file mode 100644 index 000000000000..24682b14f36d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-11-13-01-03-10.bpo-32492.voIdcp.rst @@ -0,0 +1,2 @@ +Speed up :class:`namedtuple` attribute access by 1.6x using a C fast-path +for the name descriptors. Patch by Pablo Galindo. diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 4da0662f0c7f..cc325e1aaac4 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -7,6 +7,14 @@ #include <sys/types.h> /* For size_t */ #endif +/*[clinic input] +class _tuplegetter "_tuplegetterobject *" "&tuplegetter_type" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=ee5ed5baabe35068]*/ + +static PyTypeObject tuplegetter_type; +#include "clinic/_collectionsmodule.c.h" + /* collections module implementation of a deque() datatype Written and maintained by Raymond D. Hettinger <python(a)rcn.com> */ @@ -2328,6 +2336,156 @@ _count_elements(PyObject *self, PyObject *args) Py_RETURN_NONE; } +/* Helper functions for namedtuples */ + +typedef struct { + PyObject_HEAD + Py_ssize_t index; + PyObject* doc; +} _tuplegetterobject; + +/*[clinic input] +@classmethod +_tuplegetter.__new__ as tuplegetter_new + + index: Py_ssize_t + doc: object + / +[clinic start generated code]*/ + +static PyObject * +tuplegetter_new_impl(PyTypeObject *type, Py_ssize_t index, PyObject *doc) +/*[clinic end generated code: output=014be444ad80263f input=87c576a5bdbc0bbb]*/ +{ + _tuplegetterobject* self; + self = (_tuplegetterobject *)type->tp_alloc(type, 0); + if (self == NULL) { + return NULL; + } + self->index = index; + Py_INCREF(doc); + self->doc = doc; + return (PyObject *)self; +} + +static PyObject * +tuplegetterdescr_get(PyObject *self, PyObject *obj, PyObject *type) +{ + PyObject *result; + if (obj == NULL) { + Py_INCREF(self); + return self; + } + if (!PyTuple_Check(obj)) { + if (obj == Py_None) { + Py_INCREF(self); + return self; + } + PyErr_Format(PyExc_TypeError, + "descriptor for index '%d' for tuple subclasses " + "doesn't apply to '%s' object", + ((_tuplegetterobject*)self)->index, + obj->ob_type->tp_name); + return NULL; + } + + Py_ssize_t index = ((_tuplegetterobject*)self)->index; + + if (!valid_index(index, PyTuple_GET_SIZE(obj))) { + PyErr_SetString(PyExc_IndexError, "tuple index out of range"); + return NULL; + } + + result = PyTuple_GET_ITEM(obj, index); + Py_INCREF(result); + return result; +} + +static int +tuplegetter_set(PyObject *self, PyObject *obj, PyObject *value) +{ + if (value == NULL) { + PyErr_SetString(PyExc_AttributeError, "can't delete attribute"); + } else { + PyErr_SetString(PyExc_AttributeError, "can't set attribute"); + } + return -1; +} + +static int +tuplegetter_traverse(PyObject *self, visitproc visit, void *arg) +{ + _tuplegetterobject *tuplegetter = (_tuplegetterobject *)self; + Py_VISIT(tuplegetter->doc); + return 0; +} + +static int +tuplegetter_clear(PyObject *self) +{ + _tuplegetterobject *tuplegetter = (_tuplegetterobject *)self; + Py_CLEAR(tuplegetter->doc); + return 0; +} + +static void +tuplegetter_dealloc(_tuplegetterobject *self) +{ + PyObject_GC_UnTrack(self); + tuplegetter_clear((PyObject*)self); + Py_TYPE(self)->tp_free((PyObject*)self); +} + + +static PyMemberDef tuplegetter_members[] = { + {"__doc__", T_OBJECT, offsetof(_tuplegetterobject, doc), 0}, + {0} +}; + +static PyTypeObject tuplegetter_type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_collections._tuplegetter", /* tp_name */ + sizeof(_tuplegetterobject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)tuplegetter_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ + 0, /* tp_doc */ + (traverseproc)tuplegetter_traverse, /* tp_traverse */ + (inquiry)tuplegetter_clear, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + tuplegetter_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + tuplegetterdescr_get, /* tp_descr_get */ + tuplegetter_set, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + tuplegetter_new, /* tp_new */ + 0, +}; + + /* module level code ********************************************************/ PyDoc_STRVAR(module_doc, @@ -2386,5 +2544,10 @@ PyInit__collections(void) Py_INCREF(&dequereviter_type); PyModule_AddObject(m, "_deque_reverse_iterator", (PyObject *)&dequereviter_type); + if (PyType_Ready(&tuplegetter_type) < 0) + return NULL; + Py_INCREF(&tuplegetter_type); + PyModule_AddObject(m, "_tuplegetter", (PyObject *)&tuplegetter_type); + return m; } diff --git a/Modules/clinic/_collectionsmodule.c.h b/Modules/clinic/_collectionsmodule.c.h new file mode 100644 index 000000000000..12626c1f6618 --- /dev/null +++ b/Modules/clinic/_collectionsmodule.c.h @@ -0,0 +1,28 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +static PyObject * +tuplegetter_new_impl(PyTypeObject *type, Py_ssize_t index, PyObject *doc); + +static PyObject * +tuplegetter_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + PyObject *return_value = NULL; + Py_ssize_t index; + PyObject *doc; + + if ((type == &tuplegetter_type) && + !_PyArg_NoKeywords("_tuplegetter", kwargs)) { + goto exit; + } + if (!PyArg_ParseTuple(args, "nO:_tuplegetter", + &index, &doc)) { + goto exit; + } + return_value = tuplegetter_new_impl(type, index, doc); + +exit: + return return_value; +} +/*[clinic end generated code: output=83746071eacc28d3 input=a9049054013a1b77]*/

1 0

Daily reference leaks (4243df51fe43): sum=9
by solipsis＠pitrou.net Dec. 30, 2018

Dec. 30, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 7, 0] memory blocks, sum=7 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [0, -2, 0] memory blocks, sum=-2 test_multiprocessing_spawn leaked [-2, 2, 0] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogKzGs6s', '--timeout', '7200']

1 0