Mailman 3 August 2021 - Python-checkins

bpo-44135: [docs] Fix inline markup (GH-28095)
by miss-islington Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/8711b3d0ac89599fcd16edcb107169bb19… commit: 8711b3d0ac89599fcd16edcb107169bb19a00737 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-08-31T09:25:08-07:00 summary: bpo-44135: [docs] Fix inline markup (GH-28095) (cherry picked from commit 9a7ec2fcdee2da9e080ca459d4c240776df72567) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index fef6c6292f95c..9629acec2bc72 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -916,7 +916,7 @@ are always available. They are listed here in alphabetical order. Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual <abstract base class>`) of *classinfo*. A class is considered a subclass of itself. *classinfo* may be a tuple of class - objects or a :ref:`types-union`, in which case return True if *class* is a + objects or a :ref:`types-union`, in which case return ``True`` if *class* is a subclass of any entry in *classinfo*. In any other case, a :exc:`TypeError` exception is raised.

1 0

bpo-37596: Clean up the set/frozenset marshalling code (GH-28068)
by brandtbucher Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/51999c960e7fc45feebd629421dec6524a… commit: 51999c960e7fc45feebd629421dec6524a5fc803 branch: main author: Brandt Bucher <brandt(a)python.org> committer: brandtbucher <brandtbucher(a)gmail.com> date: 2021-08-31T09:18:33-07:00 summary: bpo-37596: Clean up the set/frozenset marshalling code (GH-28068) files: M Python/marshal.c diff --git a/Python/marshal.c b/Python/marshal.c index b69c4d09641da..60b818f0dda4a 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -507,36 +507,39 @@ w_complex_object(PyObject *v, char flag, WFILE *p) // to have their elements serialized in a consistent order (even when // they have been scrambled by hash randomization). To ensure this, we // use an order equivalent to sorted(v, key=marshal.dumps): - PyObject *pairs = PyList_New(0); + PyObject *pairs = PyList_New(n); if (pairs == NULL) { p->error = WFERR_NOMEMORY; return; } + Py_ssize_t i = 0; while (_PySet_NextEntry(v, &pos, &value, &hash)) { PyObject *dump = PyMarshal_WriteObjectToString(value, p->version); if (dump == NULL) { p->error = WFERR_UNMARSHALLABLE; - goto anyset_done; + Py_DECREF(pairs); + return; } PyObject *pair = PyTuple_Pack(2, dump, value); Py_DECREF(dump); - if (pair == NULL || PyList_Append(pairs, pair)) { + if (pair == NULL) { p->error = WFERR_NOMEMORY; - Py_XDECREF(pair); - goto anyset_done; + Py_DECREF(pairs); + return; } - Py_DECREF(pair); + PyList_SET_ITEM(pairs, i++, pair); } + assert(i == n); if (PyList_Sort(pairs)) { p->error = WFERR_NOMEMORY; - goto anyset_done; + Py_DECREF(pairs); + return; } for (Py_ssize_t i = 0; i < n; i++) { PyObject *pair = PyList_GET_ITEM(pairs, i); value = PyTuple_GET_ITEM(pair, 1); w_object(value, p); } - anyset_done: Py_DECREF(pairs); } else if (PyCode_Check(v)) {

1 0

bpo-45061: Detect Py_DECREF(Py_True) bug (GH-28089)
by vstinner Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/4300352000beed22fb525ec45fd331918d… commit: 4300352000beed22fb525ec45fd331918d206528 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2021-08-31T18:05:15+02:00 summary: bpo-45061: Detect Py_DECREF(Py_True) bug (GH-28089) Add a deallocator to the bool type to detect refcount bugs in C extensions which call Py_DECREF(Py_True) or Py_DECREF(Py_False) by mistake. files: A Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst M Objects/boolobject.c M Objects/object.c diff --git a/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst b/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst new file mode 100644 index 00000000000000..58bd534601fb9d --- /dev/null +++ b/Misc/NEWS.d/next/C API/2021-08-31-15-21-36.bpo-45061.ZH0HVe.rst @@ -0,0 +1,3 @@ +Add a deallocator to the :class:`bool` type to detect refcount bugs in C +extensions which call ``Py_DECREF(Py_True);`` or ``Py_DECREF(Py_False);`` by +mistake. Patch by Victor Stinner. diff --git a/Objects/boolobject.c b/Objects/boolobject.c index b786966533e1d6..bc1666f55717c1 100644 --- a/Objects/boolobject.c +++ b/Objects/boolobject.c @@ -153,6 +153,13 @@ static PyNumberMethods bool_as_number = { 0, /* nb_index */ }; +static void _Py_NO_RETURN +bool_dealloc(PyObject* Py_UNUSED(ignore)) +{ + Py_FatalError("deallocating True or False likely caused by " + "a refcount bug in a C extension"); +} + /* The type object for bool. Note that this cannot be subclassed! */ PyTypeObject PyBool_Type = { @@ -160,7 +167,7 @@ PyTypeObject PyBool_Type = { "bool", sizeof(struct _longobject), 0, - 0, /* tp_dealloc */ + bool_dealloc, /* tp_dealloc */ 0, /* tp_vectorcall_offset */ 0, /* tp_getattr */ 0, /* tp_setattr */ diff --git a/Objects/object.c b/Objects/object.c index 446c974f8e614b..026262b5448495 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1560,14 +1560,11 @@ none_repr(PyObject *op) return PyUnicode_FromString("None"); } -/* ARGUSED */ static void _Py_NO_RETURN -none_dealloc(PyObject* ignore) +none_dealloc(PyObject* Py_UNUSED(ignore)) { - /* This should never get called, but we also don't want to SEGV if - * we accidentally decref None out of existence. - */ - Py_FatalError("deallocating None"); + Py_FatalError("deallocating None likely caused by a refcount bug " + "in a C extension"); } static PyObject *

1 0

bpo-44135: [docs] Fix inline markup (GH-28095)
by ambv Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/9a7ec2fcdee2da9e080ca459d4c240776d… commit: 9a7ec2fcdee2da9e080ca459d4c240776df72567 branch: main author: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-08-31T18:01:17+02:00 summary: bpo-44135: [docs] Fix inline markup (GH-28095) files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index fef6c6292f95c..9629acec2bc72 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -916,7 +916,7 @@ are always available. They are listed here in alphabetical order. Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual <abstract base class>`) of *classinfo*. A class is considered a subclass of itself. *classinfo* may be a tuple of class - objects or a :ref:`types-union`, in which case return True if *class* is a + objects or a :ref:`types-union`, in which case return ``True`` if *class* is a subclass of any entry in *classinfo*. In any other case, a :exc:`TypeError` exception is raised.

1 0

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193) (GH-28094)
by ambv Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/5f66ad09ff2c51521e1512888cac84e0cc… commit: 5f66ad09ff2c51521e1512888cac84e0cc0907d4 branch: 3.9 author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2021-08-31T18:00:16+02:00 summary: bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193) (GH-28094) This is a quasi-backport to 3.9 since the wording in this branch is different. Co-authored-by: Zachary Kneupper zachary.kneupper(a)gmail.com files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index c5c1c161293f6..39ce338d38871 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -862,8 +862,8 @@ are always available. They are listed here in alphabetical order. Return ``True`` if *class* is a subclass (direct, indirect or :term:`virtual <abstract base class>`) of *classinfo*. A class is considered a subclass of itself. *classinfo* may be a tuple of class - objects, in which case every entry in *classinfo* will be checked. In any other - case, a :exc:`TypeError` exception is raised. + objects, in which case return ``True`` if *class* is a subclass of any entry + in *classinfo*. In any other case, a :exc:`TypeError` exception is raised. .. function:: iter(object[, sentinel])

1 0

bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090)
by miss-islington Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/c4c57e5c0eb79795d4fd1d9d8292455567… commit: c4c57e5c0eb79795d4fd1d9d8292455567c60070 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-08-31T08:53:17-07:00 summary: bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090) Fix indentation of <no Python frame> message in a faulthandler traceback or a Fatal Python error traceback. Example: Current thread 0x00007f03896fb740 (most recent call first): Garbage-collecting <no Python frame> (cherry picked from commit 888d4cc06b887e77f281ba4d640e281cb4c61b7b) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: M Python/traceback.c diff --git a/Python/traceback.c b/Python/traceback.c index 88ffc01c6eca3..9b23f45ba5bb8 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -801,7 +801,7 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header) // not modify Python objects. frame = tstate->frame; if (frame == NULL) { - PUTS(fd, "<no Python frame>\n"); + PUTS(fd, " <no Python frame>\n"); return; }

1 0

bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090)
by vstinner Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/888d4cc06b887e77f281ba4d640e281cb4… commit: 888d4cc06b887e77f281ba4d640e281cb4c61b7b branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2021-08-31T17:34:29+02:00 summary: bpo-45061: Enhance faulthandler traceback wit no Python frame (GH-28090) Fix indentation of <no Python frame> message in a faulthandler traceback or a Fatal Python error traceback. Example: Current thread 0x00007f03896fb740 (most recent call first): Garbage-collecting <no Python frame> files: M Python/traceback.c diff --git a/Python/traceback.c b/Python/traceback.c index 204121ba66d96e..cdabd2900acf49 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -1071,7 +1071,7 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header) frame = tstate->frame; if (frame == NULL) { - PUTS(fd, "<no Python frame>\n"); + PUTS(fd, " <no Python frame>\n"); return; }

1 0

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193)
by miss-islington Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/ab8fed88fc602282167f6459b43f2cf0c7… commit: ab8fed88fc602282167f6459b43f2cf0c771f60a branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-08-31T07:23:22-07:00 summary: bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193) Co-authored-by: Zachary Kneupper <zachary.kneupper(a)gmail.com> (cherry picked from commit 08767c73b5bf1f28792d5fef7f41d52822a4989f) Co-authored-by: Zack Kneupper <zachary.kneupper(a)gmail.com> files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 652e30c6088ad..fef6c6292f95c 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -916,9 +916,9 @@ are always available. They are listed here in alphabetical order. Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual <abstract base class>`) of *classinfo*. A class is considered a subclass of itself. *classinfo* may be a tuple of class - objects or a :ref:`types-union`, in which case every entry in *classinfo* - will be checked. In any other - case, a :exc:`TypeError` exception is raised. + objects or a :ref:`types-union`, in which case return True if *class* is a + subclass of any entry in *classinfo*. In any other case, a :exc:`TypeError` + exception is raised. .. versionchanged:: 3.10 *classinfo* can be a :ref:`types-union`.

1 0

bpo-45060: Get rid of few uses of the equality operators with None (GH-28087)
by serhiy-storchaka Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/3c65457156d87e55010507d616b4eecb7a… commit: 3c65457156d87e55010507d616b4eecb7a02883d branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-08-31T16:59:52+03:00 summary: bpo-45060: Get rid of few uses of the equality operators with None (GH-28087) files: M Doc/library/dbm.rst M Lib/ctypes/_aix.py M Lib/email/contentmanager.py M Lib/test/datetimetester.py M Lib/test/test_pty.py M Lib/test/test_type_annotations.py M Modules/_gdbmmodule.c M Modules/clinic/_gdbmmodule.c.h M Tools/clinic/clinic.py diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst index 57ae547b833cc0..ff01ae90f64257 100644 --- a/Doc/library/dbm.rst +++ b/Doc/library/dbm.rst @@ -216,7 +216,7 @@ supported. contains them all:: k = db.firstkey() - while k != None: + while k is not None: print(k) k = db.nextkey(k) diff --git a/Lib/ctypes/_aix.py b/Lib/ctypes/_aix.py index 190cac6507edef..26959d90a4dd6a 100644 --- a/Lib/ctypes/_aix.py +++ b/Lib/ctypes/_aix.py @@ -282,7 +282,7 @@ def find_shared(paths, name): if path.exists(archive): members = get_shared(get_ld_headers(archive)) member = get_member(re.escape(name), members) - if member != None: + if member is not None: return (base, member) else: return (None, None) @@ -307,7 +307,7 @@ def find_library(name): libpaths = get_libpaths() (base, member) = find_shared(libpaths, name) - if base != None: + if base is not None: return f"{base}({member})" # To get here, a member in an archive has not been found diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py index 3cf62dc8621cd9..fcf278dbccbac9 100644 --- a/Lib/email/contentmanager.py +++ b/Lib/email/contentmanager.py @@ -144,7 +144,7 @@ def _encode_text(string, charset, cte, policy): linesep = policy.linesep.encode('ascii') def embedded_body(lines): return linesep.join(lines) + linesep def normal_body(lines): return b'\n'.join(lines) + b'\n' - if cte==None: + if cte is None: # Use heuristics to decide on the "best" encoding. if max((len(x) for x in lines), default=0) <= policy.max_line_length: try: diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 316cf0b8da7b48..6414f1ace3fed3 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -344,7 +344,7 @@ def test_comparison(self): with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO) self.assertIn(timezone(ZERO), {timezone(ZERO)}) self.assertTrue(timezone(ZERO) != None) - self.assertFalse(timezone(ZERO) == None) + self.assertFalse(timezone(ZERO) == None) tz = timezone(ZERO) self.assertTrue(tz == ALWAYS_EQ) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index e2e9475b5d337d..0c178127571b07 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -136,7 +136,7 @@ def test_openpty(self): mode = None new_stdin_winsz = None - if self.stdin_rows != None and self.stdin_cols != None: + if self.stdin_rows is not None and self.stdin_cols is not None: try: # Modify pty.STDIN_FILENO window size; we need to # check if pty.openpty() is able to set pty slave diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py index f6c99bda3aa6f6..87f46c2ce8ce61 100644 --- a/Lib/test/test_type_annotations.py +++ b/Lib/test/test_type_annotations.py @@ -71,7 +71,7 @@ def __annotations__(self, value): @__annotations__.deleter def __annotations__(self): - if hasattr(self, 'my_annotations') and self.my_annotations == None: + if getattr(self, 'my_annotations', False) is None: raise AttributeError('__annotations__') self.my_annotations = None diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index 8a8c6e78259ccd..3c9a0e98e47427 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -450,7 +450,7 @@ The following code prints every key in the database db, without having to create a list in memory that contains them all: k = db.firstkey() - while k != None: + while k is not None: print(k) k = db.nextkey(k) [clinic start generated code]*/ @@ -458,7 +458,7 @@ to create a list in memory that contains them all: static PyObject * _gdbm_gdbm_nextkey_impl(gdbmobject *self, PyTypeObject *cls, const char *key, Py_ssize_t key_length) -/*[clinic end generated code: output=c81a69300ef41766 input=fcf6a51a96ce0172]*/ +/*[clinic end generated code: output=c81a69300ef41766 input=365e297bc0b3db48]*/ { PyObject *v; datum dbm_key, nextkey; diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h index 060445177702bb..15baf52f60d35a 100644 --- a/Modules/clinic/_gdbmmodule.c.h +++ b/Modules/clinic/_gdbmmodule.c.h @@ -161,7 +161,7 @@ PyDoc_STRVAR(_gdbm_gdbm_nextkey__doc__, "to create a list in memory that contains them all:\n" "\n" " k = db.firstkey()\n" -" while k != None:\n" +" while k is not None:\n" " print(k)\n" " k = db.nextkey(k)"); @@ -340,4 +340,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=c3ee3ad64a2f331f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1fed9ed50ad23551 input=a9049054013a1b77]*/ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index b5a884536a9ebe..d6a820d828178f 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1691,7 +1691,7 @@ def print_block(self, block): dsl_name = block.dsl_name write = self.f.write - assert not ((dsl_name == None) ^ (output == None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name) + assert not ((dsl_name is None) ^ (output is None)), "you must specify dsl_name and output together, dsl_name " + repr(dsl_name) if not dsl_name: write(input) @@ -3003,7 +3003,7 @@ def converter_init(self, *, accept={int}, type=None): self.format_unit = 'C' elif accept != {int}: fail("int_converter: illegal 'accept' argument " + repr(accept)) - if type != None: + if type is not None: self.type = type def parse_arg(self, argname, displayname):

1 0

bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193)
by ambv Aug. 31, 2021

Aug. 31, 2021

https://github.com/python/cpython/commit/08767c73b5bf1f28792d5fef7f41d52822… commit: 08767c73b5bf1f28792d5fef7f41d52822a4989f branch: main author: Zack Kneupper <zachary.kneupper(a)gmail.com> committer: ambv <lukasz(a)langa.pl> date: 2021-08-31T15:39:19+02:00 summary: bpo-44135: Refine explanation of how passing tuples to issubclass() behaves (GH-26193) Co-authored-by: Zachary Kneupper <zachary.kneupper(a)gmail.com> files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 652e30c6088ad..fef6c6292f95c 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -916,9 +916,9 @@ are always available. They are listed here in alphabetical order. Return ``True`` if *class* is a subclass (direct, indirect, or :term:`virtual <abstract base class>`) of *classinfo*. A class is considered a subclass of itself. *classinfo* may be a tuple of class - objects or a :ref:`types-union`, in which case every entry in *classinfo* - will be checked. In any other - case, a :exc:`TypeError` exception is raised. + objects or a :ref:`types-union`, in which case return True if *class* is a + subclass of any entry in *classinfo*. In any other case, a :exc:`TypeError` + exception is raised. .. versionchanged:: 3.10 *classinfo* can be a :ref:`types-union`.

1 0