Mailman 3 March 2022 - Python-checkins

bpo-46874: Speed up sqlite3 user-defined aggregate 'step' method (GH-31604)
by corona10 March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/88567a997005c9388137cd18c5d7f44834… commit: 88567a997005c9388137cd18c5d7f4483423dac3 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: corona10 <donghee.na92(a)gmail.com> date: 2022-03-03T22:54:36+09:00 summary: bpo-46874: Speed up sqlite3 user-defined aggregate 'step' method (GH-31604) files: M Lib/test/test_sqlite3/test_userfunctions.py M Modules/_sqlite/connection.c M Modules/_sqlite/module.c M Modules/_sqlite/module.h diff --git a/Lib/test/test_sqlite3/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py index 23ecfb4e8a689..2588cae3d1f15 100644 --- a/Lib/test/test_sqlite3/test_userfunctions.py +++ b/Lib/test/test_sqlite3/test_userfunctions.py @@ -502,11 +502,13 @@ def test_aggr_error_on_create(self): with self.assertRaises(sqlite.OperationalError): self.con.create_function("bla", -100, AggrSum) + @with_tracebacks(AttributeError, name="AggrNoStep") def test_aggr_no_step(self): cur = self.con.cursor() - with self.assertRaises(AttributeError) as cm: + with self.assertRaises(sqlite.OperationalError) as cm: cur.execute("select nostep(t) from test") - self.assertEqual(str(cm.exception), "'AggrNoStep' object has no attribute 'step'") + self.assertEqual(str(cm.exception), + "user-defined aggregate's 'step' method not defined") def test_aggr_no_finalize(self): cur = self.con.cursor() diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 0efb5ae35a7f5..9f12e691f8912 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -734,11 +734,11 @@ step_callback(sqlite3_context *context, int argc, sqlite3_value **params) PyObject** aggregate_instance; PyObject* stepmethod = NULL; - aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); + callback_context *ctx = (callback_context *)sqlite3_user_data(context); + assert(ctx != NULL); + aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); if (*aggregate_instance == NULL) { - callback_context *ctx = (callback_context *)sqlite3_user_data(context); - assert(ctx != NULL); *aggregate_instance = PyObject_CallNoArgs(ctx->callable); if (!*aggregate_instance) { set_sqlite_error(context, @@ -747,8 +747,10 @@ step_callback(sqlite3_context *context, int argc, sqlite3_value **params) } } - stepmethod = PyObject_GetAttrString(*aggregate_instance, "step"); + stepmethod = PyObject_GetAttr(*aggregate_instance, ctx->state->str_step); if (!stepmethod) { + set_sqlite_error(context, + "user-defined aggregate's 'step' method not defined"); goto error; } diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 70fde4910f6a4..563105c639100 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -627,6 +627,7 @@ module_clear(PyObject *module) Py_CLEAR(state->str___conform__); Py_CLEAR(state->str_executescript); Py_CLEAR(state->str_finalize); + Py_CLEAR(state->str_step); Py_CLEAR(state->str_upper); return 0; @@ -713,6 +714,7 @@ module_exec(PyObject *module) ADD_INTERNED(state, __conform__); ADD_INTERNED(state, executescript); ADD_INTERNED(state, finalize); + ADD_INTERNED(state, step); ADD_INTERNED(state, upper); /* Set error constants */ diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h index 35c6f38552606..cca52d1e04b2c 100644 --- a/Modules/_sqlite/module.h +++ b/Modules/_sqlite/module.h @@ -64,6 +64,7 @@ typedef struct { PyObject *str___conform__; PyObject *str_executescript; PyObject *str_finalize; + PyObject *str_step; PyObject *str_upper; } pysqlite_state;

1 0

bpo-46891: Fix creating a new instance of a module subclass with slots (GH-31643)
by markshannon March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/751c9ed801ad1189272ca10f0749bfc9d4… commit: 751c9ed801ad1189272ca10f0749bfc9d49b5038 branch: main author: Mark Shannon <mark(a)hotpy.org> committer: markshannon <mark(a)hotpy.org> date: 2022-03-03T10:38:27Z summary: bpo-46891: Fix creating a new instance of a module subclass with slots (GH-31643) files: A Misc/NEWS.d/next/Core and Builtins/2022-03-02-15-04-08.bpo-46891.aIAgTD.rst M Lib/test/test_module.py M Objects/moduleobject.c diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py index 619348e0e40c0..f72177dda3702 100644 --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -346,6 +346,25 @@ def test_repeated_attribute_pops(self): # frozen and namespace module reprs are tested in importlib. + def test_subclass_with_slots(self): + # In 3.11alpha this crashed, as the slots weren't NULLed. + + class ModuleWithSlots(ModuleType): + __slots__ = ("a", "b") + + def __init__(self, name): + super().__init__(name) + + m = ModuleWithSlots("name") + with self.assertRaises(AttributeError): + m.a + with self.assertRaises(AttributeError): + m.b + m.a, m.b = 1, 2 + self.assertEqual(m.a, 1) + self.assertEqual(m.b, 2) + + if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-02-15-04-08.bpo-46891.aIAgTD.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-02-15-04-08.bpo-46891.aIAgTD.rst new file mode 100644 index 0000000000000..6834b08a885c1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-02-15-04-08.bpo-46891.aIAgTD.rst @@ -0,0 +1,3 @@ +Fix bug introduced during 3.11alpha where subclasses of ``types.ModuleType`` +with ``__slots__`` were not initialized correctly, resulting in an +interpreter crash. diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 72ed9bb82f970..738b262288bcd 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -4,6 +4,7 @@ #include "Python.h" #include "pycore_call.h" // _PyObject_CallNoArgs() #include "pycore_interp.h" // PyInterpreterState.importlib +#include "pycore_object.h" // _PyType_AllocNoTrack #include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_moduleobject.h" // _PyModule_GetDef() #include "structmember.h" // PyMemberDef @@ -80,7 +81,7 @@ static PyModuleObject * new_module_notrack(PyTypeObject *mt) { PyModuleObject *m; - m = PyObject_GC_New(PyModuleObject, mt); + m = (PyModuleObject *)_PyType_AllocNoTrack(mt, 0); if (m == NULL) return NULL; m->md_def = NULL;

1 0

Fix EncodingWarning in libregrtest (GH-31654)
by methane March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/3c4abfab0d3e2a3b1e626a5eb185ad1f54… commit: 3c4abfab0d3e2a3b1e626a5eb185ad1f5436b532 branch: main author: Inada Naoki <songofacandy(a)gmail.com> committer: methane <songofacandy(a)gmail.com> date: 2022-03-03T16:19:56+09:00 summary: Fix EncodingWarning in libregrtest (GH-31654) files: M Lib/test/libregrtest/refleak.py diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py index 1069e2da008ff..a0538cbb3c377 100644 --- a/Lib/test/libregrtest/refleak.py +++ b/Lib/test/libregrtest/refleak.py @@ -142,7 +142,7 @@ def check_fd_deltas(deltas): msg = '%s leaked %s %s, sum=%s' % ( test_name, deltas, item_name, sum(deltas)) print(msg, file=sys.stderr, flush=True) - with open(fname, "a") as refrep: + with open(fname, "a", encoding="utf-8") as refrep: print(msg, file=refrep) refrep.flush() failed = True

1 0

bpo-46831: Update __build_class__ comment (GH-31522)
by miss-islington March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/fa8c5ed9c80507670c756aa83ea872b8a9… commit: fa8c5ed9c80507670c756aa83ea872b8a92bcd1c 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: 2022-03-02T22:02:59-08:00 summary: bpo-46831: Update __build_class__ comment (GH-31522) Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> (cherry picked from commit 81d968b7c30d5b41f3f28b297b7ee5345d569509) Co-authored-by: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> files: M Python/compile.c diff --git a/Python/compile.c b/Python/compile.c index 1416eb119c9e7..f012406c06693 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2440,9 +2440,8 @@ compiler_class(struct compiler *c, stmt_ty s) /* ultimately generate code for: <name> = __build_class__(<func>, <name>, *<bases>, **<keywords>) where: - <func> is a function/closure created from the class body; - it has a single argument (__locals__) where the dict - (or MutableSequence) representing the locals is passed + <func> is a zero arg function/closure created from the class body. + It mutates its locals to build the class namespace. <name> is the class name <bases> is the positional arguments and *varargs argument <keywords> is the keyword arguments and **kwds argument

1 0

bpo-46831: Update __build_class__ comment (GH-31522)
by miss-islington March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/1d428bb8c93120d449212e2a815988f28e… commit: 1d428bb8c93120d449212e2a815988f28e33b868 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-03-02T21:59:57-08:00 summary: bpo-46831: Update __build_class__ comment (GH-31522) Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> (cherry picked from commit 81d968b7c30d5b41f3f28b297b7ee5345d569509) Co-authored-by: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> files: M Python/compile.c diff --git a/Python/compile.c b/Python/compile.c index f426050ccef5b..28003b66bd4e6 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2319,9 +2319,8 @@ compiler_class(struct compiler *c, stmt_ty s) /* ultimately generate code for: <name> = __build_class__(<func>, <name>, *<bases>, **<keywords>) where: - <func> is a function/closure created from the class body; - it has a single argument (__locals__) where the dict - (or MutableSequence) representing the locals is passed + <func> is a zero arg function/closure created from the class body. + It mutates its locals to build the class namespace. <name> is the class name <bases> is the positional arguments and *varargs argument <keywords> is the keyword arguments and **kwds argument

1 0

bpo-46831: Update __build_class__ comment (#31522)
by JelleZijlstra March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/81d968b7c30d5b41f3f28b297b7ee5345d… commit: 81d968b7c30d5b41f3f28b297b7ee5345d569509 branch: main author: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-03-02T21:32:57-08:00 summary: bpo-46831: Update __build_class__ comment (#31522) Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: M Python/compile.c diff --git a/Python/compile.c b/Python/compile.c index 3609ff8f4fb9e..14595d9b576f5 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2604,9 +2604,8 @@ compiler_class(struct compiler *c, stmt_ty s) /* ultimately generate code for: <name> = __build_class__(<func>, <name>, *<bases>, **<keywords>) where: - <func> is a function/closure created from the class body; - it has a single argument (__locals__) where the dict - (or MutableSequence) representing the locals is passed + <func> is a zero arg function/closure created from the class body. + It mutates its locals to build the class namespace. <name> is the class name <bases> is the positional arguments and *varargs argument <keywords> is the keyword arguments and **kwds argument

1 0

dict: Fix refleak (GH-31650)
by methane March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/3241cba4ec55ef0b9e73bf7a5a77ef29ae… commit: 3241cba4ec55ef0b9e73bf7a5a77ef29ae4b8756 branch: main author: Inada Naoki <songofacandy(a)gmail.com> committer: methane <songofacandy(a)gmail.com> date: 2022-03-03T14:30:58+09:00 summary: dict: Fix refleak (GH-31650) files: M Objects/dictobject.c diff --git a/Objects/dictobject.c b/Objects/dictobject.c index abe455e4ae034..d8bf164f98ee6 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1523,12 +1523,16 @@ dictresize(PyDictObject *mp, uint8_t log2_newsize, int unicode) // We can not use free_keys_object here because key's reference // are moved already. - if (oldkeys != Py_EMPTY_KEYS) { - assert(oldkeys->dk_kind != DICT_KEYS_SPLIT); - assert(oldkeys->dk_refcnt == 1); #ifdef Py_REF_DEBUG - _Py_RefTotal--; + _Py_RefTotal--; #endif + if (oldkeys == Py_EMPTY_KEYS) { + oldkeys->dk_refcnt--; + assert(oldkeys->dk_refcnt > 0); + } + else { + assert(oldkeys->dk_kind != DICT_KEYS_SPLIT); + assert(oldkeys->dk_refcnt == 1); #if PyDict_MAXFREELIST > 0 struct _Py_dict_state *state = get_dict_state(); #ifdef Py_DEBUG

1 0

bpo-46643: fix NEWS entry (GH-31651)
by JelleZijlstra March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/59e1ce95f1e6ea8a556212b8b10cbc122f… commit: 59e1ce95f1e6ea8a556212b8b10cbc122f1a1711 branch: main author: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-03-02T21:27:11-08:00 summary: bpo-46643: fix NEWS entry (GH-31651) files: M Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst diff --git a/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst index 82ff831e3887d..6edcfdfd814fd 100644 --- a/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst +++ b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst @@ -1 +1,3 @@ -In :func:`typing.get_type_hints`, support evaluating stringified ``ParamSpecArgs`` and ``ParamSpecKwargs`` annotations. Patch by Gregory Beauregard. +In :func:`typing.get_type_hints`, support evaluating stringified +``ParamSpecArgs`` and ``ParamSpecKwargs`` annotations. Patch by +Gregory Beauregard.

1 0

bpo-40116: dict: Add regression test for iteration order. (GH-31550)
by methane March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/4f74052b455a54ac736f38973693aeea2e… commit: 4f74052b455a54ac736f38973693aeea2ec14116 branch: main author: Inada Naoki <songofacandy(a)gmail.com> committer: methane <songofacandy(a)gmail.com> date: 2022-03-03T13:06:29+09:00 summary: bpo-40116: dict: Add regression test for iteration order. (GH-31550) files: A Misc/NEWS.d/next/Core and Builtins/2022-02-24-16-34-17.bpo-40116.AeVGG2.rst M Lib/test/test_dict.py M Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index 66f5d56deeaaf..e60ae4309cbc1 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -1077,6 +1077,23 @@ def test_splittable_popitem(self): self.assertEqual(list(a), ['x', 'y']) self.assertEqual(list(b), ['x', 'y', 'z']) + @support.cpython_only + def test_splittable_update(self): + """dict.update(other) must preserve order in other.""" + class C: + def __init__(self, order): + if order: + self.a, self.b, self.c = 1, 2, 3 + else: + self.c, self.b, self.a = 1, 2, 3 + o = C(True) + o = C(False) # o.__dict__ has reversed order. + self.assertEqual(list(o.__dict__), ["c", "b", "a"]) + + d = {} + d.update(o.__dict__) + self.assertEqual(list(d), ["c", "b", "a"]) + def test_iterator_pickling(self): for proto in range(pickle.HIGHEST_PROTOCOL + 1): data = {1:"a", 2:"b", 3:"c"} diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-02-24-16-34-17.bpo-40116.AeVGG2.rst b/Misc/NEWS.d/next/Core and Builtins/2022-02-24-16-34-17.bpo-40116.AeVGG2.rst new file mode 100644 index 0000000000000..fb3f82e880d0a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-02-24-16-34-17.bpo-40116.AeVGG2.rst @@ -0,0 +1,2 @@ +Fix regression that dict.update(other) may don't respect iterate order of +other when other is key sharing dict. diff --git a/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst index e8b4d66e943f6..82ff831e3887d 100644 --- a/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst +++ b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst @@ -1 +1 @@ -In :func:`typing.get_type_hints`, support evaluating stringified ``ParamSpecArgs`` and ``ParamSpecKwargs`` annotations. Patch by Gregory Beauregard. \ No newline at end of file +In :func:`typing.get_type_hints`, support evaluating stringified ``ParamSpecArgs`` and ``ParamSpecKwargs`` annotations. Patch by Gregory Beauregard.

1 0

bpo-46643: Fix stringized P.args/P.kwargs with get_type_hints (GH-31238)
by miss-islington March 3, 2022

March 3, 2022

https://github.com/python/cpython/commit/257f5be7f7fad37d0db6c145e534e5b728… commit: 257f5be7f7fad37d0db6c145e534e5b7289d8804 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: 2022-03-02T18:26:50-08:00 summary: bpo-46643: Fix stringized P.args/P.kwargs with get_type_hints (GH-31238) (cherry picked from commit 75d2d945b4e28ca34506b2d4902367b61a8dff82) Co-authored-by: Gregory Beauregard <greg(a)greg.red> files: A Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 8ced27824205d..f3ebece4b4a7f 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -4865,6 +4865,18 @@ def test_args_kwargs(self): self.assertEqual(repr(P.args), "P.args") self.assertEqual(repr(P.kwargs), "P.kwargs") + def test_stringized(self): + P = ParamSpec('P') + class C(Generic[P]): + func: Callable["P", int] + def foo(self, *args: "P.args", **kwargs: "P.kwargs"): + pass + + self.assertEqual(gth(C, globals(), locals()), {"func": Callable[P, int]}) + self.assertEqual( + gth(C.foo, globals(), locals()), {"args": P.args, "kwargs": P.kwargs} + ) + def test_user_generics(self): T = TypeVar("T") P = ParamSpec("P") diff --git a/Lib/typing.py b/Lib/typing.py index 5d900dd6c33ab..4519cdbc951c9 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -169,7 +169,8 @@ def _type_check(arg, msg, is_argument=True, module=None, *, allow_special_forms= return arg if isinstance(arg, _SpecialForm) or arg in (Generic, Protocol): raise TypeError(f"Plain {arg} is not valid as type argument") - if isinstance(arg, (type, TypeVar, ForwardRef, types.UnionType, ParamSpec)): + if isinstance(arg, (type, TypeVar, ForwardRef, types.UnionType, ParamSpec, + ParamSpecArgs, ParamSpecKwargs)): return arg if not callable(arg): raise TypeError(f"{msg} Got {arg!r:.100}.") diff --git a/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst new file mode 100644 index 0000000000000..e8b4d66e943f6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-02-09-22-40-11.bpo-46643.aBlIx1.rst @@ -0,0 +1 @@ +In :func:`typing.get_type_hints`, support evaluating stringified ``ParamSpecArgs`` and ``ParamSpecKwargs`` annotations. Patch by Gregory Beauregard. \ No newline at end of file

1 0