Mailman 3 March 2020 - Python-checkins

bpo-8901: Windows registry path is now ignored with the -E option (GH-18169)
by Zackery Spytz March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/676b105111e2399ed400cd13ab113f9aa8… commit: 676b105111e2399ed400cd13ab113f9aa891760d branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T17:04:45+01:00 summary: bpo-8901: Windows registry path is now ignored with the -E option (GH-18169) files: A Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst M Doc/whatsnew/3.9.rst M PC/getpathp.c diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index f58bcbcd3ce4e..59083da3a262b 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -548,6 +548,11 @@ Build and C API Changes * The :c:func:`PyModule_AddType` function is added to help adding a type to a module. (Contributed by Dong-hee Na in :issue:`40024`.) +* The Windows registry is no longer used to initialize :data:`sys.path` when + the ``-E`` option is used. This is significant when embedding Python on + Windows. + (Contributed by Zackery Spytz in :issue:`8901`.) + Deprecated ========== diff --git a/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst b/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst new file mode 100644 index 0000000000000..1d452cf26297f --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst @@ -0,0 +1 @@ +Ignore the Windows registry when the ``-E`` option is used. diff --git a/PC/getpathp.c b/PC/getpathp.c index 7a2c1fd6fe63d..aa820e57a9cb2 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -783,8 +783,11 @@ calculate_module_search_path(PyCalculatePath *calculate, { int skiphome = calculate->home==NULL ? 0 : 1; #ifdef Py_ENABLE_SHARED - calculate->machine_path = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome); - calculate->user_path = getpythonregpath(HKEY_CURRENT_USER, skiphome); + if (!Py_IgnoreEnvironmentFlag) { + calculate->machine_path = getpythonregpath(HKEY_LOCAL_MACHINE, + skiphome); + calculate->user_path = getpythonregpath(HKEY_CURRENT_USER, skiphome); + } #endif /* We only use the default relative PYTHONPATH if we haven't anything better to use! */

1 0

bpo-40077: Convert _abc module to use PyType_FromSpec() (GH-19202)
by Dong-hee Na March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/53e4c91725083975598350877e2ed8e2d0… commit: 53e4c91725083975598350877e2ed8e2d0194114 branch: master author: Dong-hee Na <donghee.na92(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T16:35:38+02:00 summary: bpo-40077: Convert _abc module to use PyType_FromSpec() (GH-19202) Replace statically allocated types with heap allocated types: use PyType_FromSpec(). Add a module state to store the _abc_data_type. Add traverse, clear and free functions to the module. files: M Lib/test/test_abc.py M Modules/_abc.c diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py index 000e5838e3c71..7e9c47b3cacb9 100644 --- a/Lib/test/test_abc.py +++ b/Lib/test/test_abc.py @@ -326,7 +326,7 @@ class B: token_old = abc_get_cache_token() A.register(B) token_new = abc_get_cache_token() - self.assertNotEqual(token_old, token_new) + self.assertGreater(token_new, token_old) self.assertTrue(isinstance(b, A)) self.assertTrue(isinstance(b, (A,))) diff --git a/Modules/_abc.c b/Modules/_abc.c index c991295d311a1..62709822f9233 100644 --- a/Modules/_abc.c +++ b/Modules/_abc.c @@ -20,13 +20,26 @@ _Py_IDENTIFIER(_abc_impl); _Py_IDENTIFIER(__subclasscheck__); _Py_IDENTIFIER(__subclasshook__); +typedef struct { + PyTypeObject *_abc_data_type; +} _abcmodule_state; + /* A global counter that is incremented each time a class is registered as a virtual subclass of anything. It forces the negative cache to be cleared before its next use. Note: this counter is private. Use `abc.get_cache_token()` for external code. */ +// FIXME: PEP 573: Move abc_invalidation_counter into _abcmodule_state. static unsigned long long abc_invalidation_counter = 0; +static inline _abcmodule_state* +get_abc_state(PyObject *module) +{ + void *state = PyModule_GetState(module); + assert(state != NULL); + return (_abcmodule_state *)state; +} + /* This object stores internal state for ABCs. Note that we can use normal sets for caches, since they are never iterated over. */ @@ -41,10 +54,12 @@ typedef struct { static void abc_data_dealloc(_abc_data *self) { + PyTypeObject *tp = Py_TYPE(self); Py_XDECREF(self->_abc_registry); Py_XDECREF(self->_abc_cache); Py_XDECREF(self->_abc_negative_cache); - Py_TYPE(self)->tp_free(self); + tp->tp_free(self); + Py_DECREF(tp); } static PyObject * @@ -65,24 +80,29 @@ abc_data_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyDoc_STRVAR(abc_data_doc, "Internal state held by ABC machinery."); -static PyTypeObject _abc_data_type = { - PyVarObject_HEAD_INIT(NULL, 0) - "_abc_data", /*tp_name*/ - sizeof(_abc_data), /*tp_basicsize*/ - .tp_dealloc = (destructor)abc_data_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_alloc = PyType_GenericAlloc, - .tp_new = abc_data_new, +static PyType_Slot _abc_data_type_spec_slots[] = { + {Py_tp_doc, (void *)abc_data_doc}, + {Py_tp_new, abc_data_new}, + {Py_tp_dealloc, abc_data_dealloc}, + {0, 0} +}; + +static PyType_Spec _abc_data_type_spec = { + .name = "_abc._abc_data", + .basicsize = sizeof(_abc_data), + .flags = Py_TPFLAGS_DEFAULT, + .slots = _abc_data_type_spec_slots, }; static _abc_data * -_get_impl(PyObject *self) +_get_impl(PyObject *module, PyObject *self) { + _abcmodule_state *state = get_abc_state(module); PyObject *impl = _PyObject_GetAttrId(self, &PyId__abc_impl); if (impl == NULL) { return NULL; } - if (!Py_IS_TYPE(impl, &_abc_data_type)) { + if (!Py_IS_TYPE(impl, state->_abc_data_type)) { PyErr_SetString(PyExc_TypeError, "_abc_impl is set to a wrong type"); Py_DECREF(impl); return NULL; @@ -179,7 +199,7 @@ static PyObject * _abc__reset_registry(PyObject *module, PyObject *self) /*[clinic end generated code: output=92d591a43566cc10 input=12a0b7eb339ac35c]*/ { - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -206,7 +226,7 @@ static PyObject * _abc__reset_caches(PyObject *module, PyObject *self) /*[clinic end generated code: output=f296f0d5c513f80c input=c0ac616fd8acfb6f]*/ { - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -241,7 +261,7 @@ static PyObject * _abc__get_dump(PyObject *module, PyObject *self) /*[clinic end generated code: output=9d9569a8e2c1c443 input=2c5deb1bfe9e3c79]*/ { - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -391,13 +411,14 @@ static PyObject * _abc__abc_init(PyObject *module, PyObject *self) /*[clinic end generated code: output=594757375714cda1 input=8d7fe470ff77f029]*/ { + _abcmodule_state *state = get_abc_state(module); PyObject *data; if (compute_abstract_methods(self) < 0) { return NULL; } /* Set up inheritance registry. */ - data = abc_data_new(&_abc_data_type, NULL, NULL); + data = abc_data_new(state->_abc_data_type, NULL, NULL); if (data == NULL) { return NULL; } @@ -446,7 +467,7 @@ _abc__abc_register_impl(PyObject *module, PyObject *self, PyObject *subclass) if (result < 0) { return NULL; } - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -480,7 +501,7 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self, /*[clinic end generated code: output=b8b5148f63b6b56f input=a4f4525679261084]*/ { PyObject *subtype, *result = NULL, *subclass = NULL; - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -576,7 +597,7 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self, PyObject *ok, *subclasses = NULL, *result = NULL; Py_ssize_t pos; int incache; - _abc_data *impl = _get_impl(self); + _abc_data *impl = _get_impl(module, self); if (impl == NULL) { return NULL; } @@ -795,7 +816,7 @@ _abc_get_cache_token_impl(PyObject *module) return PyLong_FromUnsignedLongLong(abc_invalidation_counter); } -static struct PyMethodDef module_functions[] = { +static struct PyMethodDef _abcmodule_methods[] = { _ABC_GET_CACHE_TOKEN_METHODDEF _ABC__ABC_INIT_METHODDEF _ABC__RESET_REGISTRY_METHODDEF @@ -808,17 +829,41 @@ static struct PyMethodDef module_functions[] = { }; static int -_abc_exec(PyObject *module) +_abcmodule_exec(PyObject *module) { - if (PyType_Ready(&_abc_data_type) < 0) { + _abcmodule_state *state = get_abc_state(module); + state->_abc_data_type = (PyTypeObject *)PyType_FromSpec(&_abc_data_type_spec); + if (state->_abc_data_type == NULL) { return -1; } - _abc_data_type.tp_doc = abc_data_doc; + + return 0; +} + +static int +_abcmodule_traverse(PyObject *module, visitproc visit, void *arg) +{ + _abcmodule_state *state = get_abc_state(module); + Py_VISIT(state->_abc_data_type); return 0; } -static PyModuleDef_Slot _abc_slots[] = { - {Py_mod_exec, _abc_exec}, +static int +_abcmodule_clear(PyObject *module) +{ + _abcmodule_state *state = get_abc_state(module); + Py_CLEAR(state->_abc_data_type); + return 0; +} + +static void +_abcmodule_free(void *module) +{ + _abcmodule_clear((PyObject *)module); +} + +static PyModuleDef_Slot _abcmodule_slots[] = { + {Py_mod_exec, _abcmodule_exec}, {0, NULL} }; @@ -826,12 +871,12 @@ static struct PyModuleDef _abcmodule = { PyModuleDef_HEAD_INIT, "_abc", _abc__doc__, - 0, - module_functions, - _abc_slots, - NULL, - NULL, - NULL + sizeof(_abcmodule_state), + _abcmodule_methods, + _abcmodule_slots, + _abcmodule_traverse, + _abcmodule_clear, + _abcmodule_free, }; PyMODINIT_FUNC

1 0

bpo-37207: Use vectorcall for list() (GH-18928)
by Petr Viktorin March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/ce105541f8ebcf2dffcadedfdeffdb698a… commit: ce105541f8ebcf2dffcadedfdeffdb698a0edb44 branch: master author: Petr Viktorin <encukou(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T14:16:16+02:00 summary: bpo-37207: Use vectorcall for list() (GH-18928) Speed up calls to list() by using the PEP 590 vectorcall calling convention. Patch by Mark Shannon. Co-authored-by: Mark Shannon <mark(a)hotpy.org> Co-authored-by: Dong-hee Na <donghee.na92(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLS.rst M Objects/listobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLS.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLS.rst new file mode 100644 index 0000000000000..b6d0236db4635 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLS.rst @@ -0,0 +1,2 @@ +Speed up calls to ``list()`` by using the :pep:`590` ``vectorcall`` +calling convention. Patch by Mark Shannon. diff --git a/Objects/listobject.c b/Objects/listobject.c index 4e2b6a9c1609a..91687bcd22910 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2719,6 +2719,33 @@ list___init___impl(PyListObject *self, PyObject *iterable) return 0; } +static PyObject * +list_vectorcall(PyObject *type, PyObject * const*args, + size_t nargsf, PyObject *kwnames) +{ + if (!_PyArg_NoKwnames("list", kwnames)) { + return NULL; + } + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (!_PyArg_CheckPositional("list", nargs, 0, 1)) { + return NULL; + } + + assert(PyType_Check(type)); + PyObject *list = PyType_GenericAlloc((PyTypeObject *)type, 0); + if (list == NULL) { + return NULL; + } + if (nargs) { + if (list___init___impl((PyListObject *)list, args[0])) { + Py_DECREF(list); + return NULL; + } + } + return list; +} + + /*[clinic input] list.__sizeof__ @@ -3034,6 +3061,7 @@ PyTypeObject PyList_Type = { PyType_GenericAlloc, /* tp_alloc */ PyType_GenericNew, /* tp_new */ PyObject_GC_Del, /* tp_free */ + .tp_vectorcall = list_vectorcall, }; /*********************** List Iterator **************************/

1 0

bpo-39073: validate Address parts to disallow CRLF (#19007)
by Ashwin Ramaswami March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/614f17211c5fc0e5b828be1d3320661d10… commit: 614f17211c5fc0e5b828be1d3320661d1038fe8f branch: master author: Ashwin Ramaswami <aramaswamis(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-29T20:38:41-04:00 summary: bpo-39073: validate Address parts to disallow CRLF (#19007) Disallow CR or LF in email.headerregistry.Address arguments to guard against header injection attacks. files: A Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i.rst M Lib/email/headerregistry.py M Lib/test/test_email/test_headerregistry.py diff --git a/Lib/email/headerregistry.py b/Lib/email/headerregistry.py index cc1d191291814..5d84fc0d82d0b 100644 --- a/Lib/email/headerregistry.py +++ b/Lib/email/headerregistry.py @@ -31,6 +31,11 @@ def __init__(self, display_name='', username='', domain='', addr_spec=None): without any Content Transfer Encoding. """ + + inputs = ''.join(filter(None, (display_name, username, domain, addr_spec))) + if '\r' in inputs or '\n' in inputs: + raise ValueError("invalid arguments; address parts cannot contain CR or LF") + # This clause with its potential 'raise' may only happen when an # application program creates an Address object using an addr_spec # keyword. The email library code itself must always supply username diff --git a/Lib/test/test_email/test_headerregistry.py b/Lib/test/test_email/test_headerregistry.py index 38f7ddbf06d5c..82e121350ffbf 100644 --- a/Lib/test/test_email/test_headerregistry.py +++ b/Lib/test/test_email/test_headerregistry.py @@ -1437,6 +1437,25 @@ def test_il8n(self): # with self.assertRaises(ValueError): # Address('foo', 'wők', 'example.com') + def test_crlf_in_constructor_args_raises(self): + cases = ( + dict(display_name='foo\r'), + dict(display_name='foo\n'), + dict(display_name='foo\r\n'), + dict(domain='example.com\r'), + dict(domain='example.com\n'), + dict(domain='example.com\r\n'), + dict(username='wok\r'), + dict(username='wok\n'), + dict(username='wok\r\n'), + dict(addr_spec='wok(a)example.com\r'), + dict(addr_spec='wok(a)example.com\n'), + dict(addr_spec='wok(a)example.com\r\n') + ) + for kwargs in cases: + with self.subTest(kwargs=kwargs), self.assertRaisesRegex(ValueError, "invalid arguments"): + Address(**kwargs) + def test_non_ascii_username_in_addr_spec_raises(self): with self.assertRaises(ValueError): Address('foo', addr_spec='wők(a)example.com') diff --git a/Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i.rst b/Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i.rst new file mode 100644 index 0000000000000..6c9447b897bf6 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-03-15-01-28-36.bpo-39073.6Szd3i.rst @@ -0,0 +1 @@ +Disallow CR or LF in email.headerregistry.Address arguments to guard against header injection attacks.

1 0

(no subject)
by Batuhan Taşkaya March 29, 2020

March 29, 2020

To: python-checkins(a)python.org Subject: bpo-40096: Support __attribute__((__noreturn__)) on xlc (GH-19204) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/0003c2dc1d4cf5b122e73e83177fd274fa… 9913 commit: 0003c2dc1d4cf5b122e73e83177fd274fa9a9913 branch: master author: Batuhan Ta=C5=9Fkaya <batuhanosmantaskaya(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-29T16:52:32+01:00 summary: bpo-40096: Support __attribute__((__noreturn__)) on xlc (GH-19204) files: M Include/pyport.h diff --git a/Include/pyport.h b/Include/pyport.h index 64c73f012e7a7..72e74e046a5ee 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -832,6 +832,7 @@ extern _invalid_parameter_handler _Py_silent_invalid_para= meter_handler; =20 PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void); */ #if defined(__clang__) || \ + defined(__xlc__) || \ (defined(__GNUC__) && \ ((__GNUC__ >=3D 3) || \ (__GNUC__ =3D=3D 2) && (__GNUC_MINOR__ >=3D 5)))

1 0

bpo-40024: Update _elementtree to use PyModule_AddType() (GH-19205)
by Dong-hee Na March 29, 2020

March 29, 2020

https://github.com/python/cpython/commit/016bdd519d76c282bbe0220c67a49226b6… commit: 016bdd519d76c282bbe0220c67a49226b6262638 branch: master author: Dong-hee Na <donghee.na92(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-29T16:12:11+02:00 summary: bpo-40024: Update _elementtree to use PyModule_AddType() (GH-19205) files: M Modules/_elementtree.c diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index d2cad89448114..49c372d86b02b 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -4419,16 +4419,22 @@ PyInit__elementtree(void) "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL ); Py_INCREF(st->parseerror_obj); - PyModule_AddObject(m, "ParseError", st->parseerror_obj); - - Py_INCREF((PyObject *)&Element_Type); - PyModule_AddObject(m, "Element", (PyObject *)&Element_Type); + if (PyModule_AddObject(m, "ParseError", st->parseerror_obj) < 0) { + Py_DECREF(st->parseerror_obj); + return NULL; + } - Py_INCREF((PyObject *)&TreeBuilder_Type); - PyModule_AddObject(m, "TreeBuilder", (PyObject *)&TreeBuilder_Type); + PyTypeObject *types[] = { + &Element_Type, + &TreeBuilder_Type, + &XMLParser_Type + }; - Py_INCREF((PyObject *)&XMLParser_Type); - PyModule_AddObject(m, "XMLParser", (PyObject *)&XMLParser_Type); + for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) { + if (PyModule_AddType(m, types[i]) < 0) { + return NULL; + } + } return m; }

1 0

bpo-38002: Use False/True for IDLE pyshell bools (GH-19203)
by Miss Islington (bot) March 28, 2020

March 28, 2020

https://github.com/python/cpython/commit/cb758011ce39678fb03e8ac3e924d90842… commit: cb758011ce39678fb03e8ac3e924d9084252e1ad branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-28T10:18:12-07:00 summary: bpo-38002: Use False/True for IDLE pyshell bools (GH-19203) Change 0/1 assignments to 'executing', 'canceled', 'reading', 'endoffile'. These are not used outside of pyshell. Other bools already use False/True. Add comment about int needed for Windows call. Remove self.more, unused in idlelib and code.InteractiveInterpreter. The latter uses 'more' as a local. (cherry picked from commit 34a49aa3e4d023b5f9e9029f4f1ec68f1a8a8120) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index d5b310ffd7a9b..43fb597c2ba6e 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -16,7 +16,7 @@ if sys.platform == 'win32': try: import ctypes - PROCESS_SYSTEM_DPI_AWARE = 1 + PROCESS_SYSTEM_DPI_AWARE = 1 # Int required. ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE) except (ImportError, AttributeError, OSError): pass @@ -676,7 +676,6 @@ def execfile(self, filename, source=None): def runsource(self, source): "Extend base class method: Stuff the source in the line cache first" filename = self.stuffsource(source) - self.more = 0 # at the moment, InteractiveInterpreter expects str assert isinstance(source, str) # InteractiveInterpreter.runsource() calls its runcode() method, @@ -993,12 +992,12 @@ def open_debugger(self): def beginexecuting(self): "Helper for ModifiedInterpreter" self.resetoutput() - self.executing = 1 + self.executing = True def endexecuting(self): "Helper for ModifiedInterpreter" - self.executing = 0 - self.canceled = 0 + self.executing = False + self.canceled = False self.showprompt() def close(self): @@ -1075,7 +1074,7 @@ def stop_readline(self): def readline(self): save = self.reading try: - self.reading = 1 + self.reading = True self.top.mainloop() # nested mainloop() finally: self.reading = save @@ -1087,11 +1086,11 @@ def readline(self): line = "\n" self.resetoutput() if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt if self.endoffile: - self.endoffile = 0 + self.endoffile = False line = "" return line @@ -1109,8 +1108,8 @@ def cancel_callback(self, event=None): self.interp.write("KeyboardInterrupt\n") self.showprompt() return "break" - self.endoffile = 0 - self.canceled = 1 + self.endoffile = False + self.canceled = True if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() @@ -1130,8 +1129,8 @@ def eof_callback(self, event): self.resetoutput() self.close() else: - self.canceled = 0 - self.endoffile = 1 + self.canceled = False + self.endoffile = True self.top.quit() return "break" @@ -1303,7 +1302,7 @@ def write(self, s, tags=()): raise ###pass # ### 11Aug07 KBK if we are expecting exceptions # let's find out what they are and be specific. if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt return count

1 0

bpo-38002: Use False/True for IDLE pyshell bools (GH-19203)
by Miss Islington (bot) March 28, 2020

March 28, 2020

https://github.com/python/cpython/commit/8c3ab189ae552401581ecf0b260a96d80d… commit: 8c3ab189ae552401581ecf0b260a96d80dcdae28 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-28T10:16:03-07:00 summary: bpo-38002: Use False/True for IDLE pyshell bools (GH-19203) Change 0/1 assignments to 'executing', 'canceled', 'reading', 'endoffile'. These are not used outside of pyshell. Other bools already use False/True. Add comment about int needed for Windows call. Remove self.more, unused in idlelib and code.InteractiveInterpreter. The latter uses 'more' as a local. (cherry picked from commit 34a49aa3e4d023b5f9e9029f4f1ec68f1a8a8120) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index d5b310ffd7a9b..43fb597c2ba6e 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -16,7 +16,7 @@ if sys.platform == 'win32': try: import ctypes - PROCESS_SYSTEM_DPI_AWARE = 1 + PROCESS_SYSTEM_DPI_AWARE = 1 # Int required. ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE) except (ImportError, AttributeError, OSError): pass @@ -676,7 +676,6 @@ def execfile(self, filename, source=None): def runsource(self, source): "Extend base class method: Stuff the source in the line cache first" filename = self.stuffsource(source) - self.more = 0 # at the moment, InteractiveInterpreter expects str assert isinstance(source, str) # InteractiveInterpreter.runsource() calls its runcode() method, @@ -993,12 +992,12 @@ def open_debugger(self): def beginexecuting(self): "Helper for ModifiedInterpreter" self.resetoutput() - self.executing = 1 + self.executing = True def endexecuting(self): "Helper for ModifiedInterpreter" - self.executing = 0 - self.canceled = 0 + self.executing = False + self.canceled = False self.showprompt() def close(self): @@ -1075,7 +1074,7 @@ def stop_readline(self): def readline(self): save = self.reading try: - self.reading = 1 + self.reading = True self.top.mainloop() # nested mainloop() finally: self.reading = save @@ -1087,11 +1086,11 @@ def readline(self): line = "\n" self.resetoutput() if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt if self.endoffile: - self.endoffile = 0 + self.endoffile = False line = "" return line @@ -1109,8 +1108,8 @@ def cancel_callback(self, event=None): self.interp.write("KeyboardInterrupt\n") self.showprompt() return "break" - self.endoffile = 0 - self.canceled = 1 + self.endoffile = False + self.canceled = True if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() @@ -1130,8 +1129,8 @@ def eof_callback(self, event): self.resetoutput() self.close() else: - self.canceled = 0 - self.endoffile = 1 + self.canceled = False + self.endoffile = True self.top.quit() return "break" @@ -1303,7 +1302,7 @@ def write(self, s, tags=()): raise ###pass # ### 11Aug07 KBK if we are expecting exceptions # let's find out what they are and be specific. if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt return count

1 0

bpo-38002: Use False/True for IDLE pyshell bools (GH-19203)
by Terry Jan Reedy March 28, 2020

March 28, 2020

https://github.com/python/cpython/commit/34a49aa3e4d023b5f9e9029f4f1ec68f1a… commit: 34a49aa3e4d023b5f9e9029f4f1ec68f1a8a8120 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2020-03-28T12:51:21-04:00 summary: bpo-38002: Use False/True for IDLE pyshell bools (GH-19203) Change 0/1 assignments to 'executing', 'canceled', 'reading', 'endoffile'. These are not used outside of pyshell. Other bools already use False/True. Add comment about int needed for Windows call. Remove self.more, unused in idlelib and code.InteractiveInterpreter. The latter uses 'more' as a local. files: M Lib/idlelib/pyshell.py diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index d5b310ffd7a9b..43fb597c2ba6e 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -16,7 +16,7 @@ if sys.platform == 'win32': try: import ctypes - PROCESS_SYSTEM_DPI_AWARE = 1 + PROCESS_SYSTEM_DPI_AWARE = 1 # Int required. ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE) except (ImportError, AttributeError, OSError): pass @@ -676,7 +676,6 @@ def execfile(self, filename, source=None): def runsource(self, source): "Extend base class method: Stuff the source in the line cache first" filename = self.stuffsource(source) - self.more = 0 # at the moment, InteractiveInterpreter expects str assert isinstance(source, str) # InteractiveInterpreter.runsource() calls its runcode() method, @@ -993,12 +992,12 @@ def open_debugger(self): def beginexecuting(self): "Helper for ModifiedInterpreter" self.resetoutput() - self.executing = 1 + self.executing = True def endexecuting(self): "Helper for ModifiedInterpreter" - self.executing = 0 - self.canceled = 0 + self.executing = False + self.canceled = False self.showprompt() def close(self): @@ -1075,7 +1074,7 @@ def stop_readline(self): def readline(self): save = self.reading try: - self.reading = 1 + self.reading = True self.top.mainloop() # nested mainloop() finally: self.reading = save @@ -1087,11 +1086,11 @@ def readline(self): line = "\n" self.resetoutput() if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt if self.endoffile: - self.endoffile = 0 + self.endoffile = False line = "" return line @@ -1109,8 +1108,8 @@ def cancel_callback(self, event=None): self.interp.write("KeyboardInterrupt\n") self.showprompt() return "break" - self.endoffile = 0 - self.canceled = 1 + self.endoffile = False + self.canceled = True if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() @@ -1130,8 +1129,8 @@ def eof_callback(self, event): self.resetoutput() self.close() else: - self.canceled = 0 - self.endoffile = 1 + self.canceled = False + self.endoffile = True self.top.quit() return "break" @@ -1303,7 +1302,7 @@ def write(self, s, tags=()): raise ###pass # ### 11Aug07 KBK if we are expecting exceptions # let's find out what they are and be specific. if self.canceled: - self.canceled = 0 + self.canceled = False if not use_subprocess: raise KeyboardInterrupt return count

1 0

(no subject)
by Furkan Önder March 28, 2020

March 28, 2020

To: python-checkins(a)python.org Subject: bpo-40086: Update/fix test_etree test case in test_typing (GH-19189) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/34b0598295284e3ff6cedf5c05e159ce1f… 4d60 commit: 34b0598295284e3ff6cedf5c05e159ce1fa54d60 branch: master author: Furkan =C3=96nder <furkantahaonder(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-28T12:32:36Z summary: bpo-40086: Update/fix test_etree test case in test_typing (GH-19189) files: M Lib/test/test_typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 6b0a905048cea..8d6262b9c1b02 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -361,10 +361,8 @@ def test_union_str_pattern(self): def test_etree(self): # See https://github.com/python/typing/issues/229 # (Only relevant for Python 2.) - try: - from xml.etree.cElementTree import Element - except ImportError: - raise SkipTest("cElementTree not found") + from xml.etree.ElementTree import Element + Union[Element, str] # Shouldn't crash =20 def Elem(*args):

1 0