Mailman 3 June 2026 - Python-checkins

gh-121249: Deprecate using F/D type codes in the struct module (#152309)
by vstinner June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/40795f20ff4ef2054a7f79be537a5ba067… commit: 40795f20ff4ef2054a7f79be537a5ba06759c15f branch: main author: Sergey B Kirpichev <skirpichev(a)gmail.com> committer: vstinner <vstinner(a)python.org> date: 2026-06-30T11:57:22+02:00 summary: gh-121249: Deprecate using F/D type codes in the struct module (#152309) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: A Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst M Doc/deprecations/pending-removal-in-3.21.rst M Doc/deprecations/soft-deprecations.rst M Doc/library/struct.rst M Doc/whatsnew/3.16.rst M Lib/test/test_ctypes/test_byteswap.py M Lib/test/test_memoryview.py M Lib/test/test_struct.py M Modules/_struct.c diff --git a/Doc/deprecations/pending-removal-in-3.21.rst b/Doc/deprecations/pending-removal-in-3.21.rst index 18b89a20e4a2082..dbd73313b4f7779 100644 --- a/Doc/deprecations/pending-removal-in-3.21.rst +++ b/Doc/deprecations/pending-removal-in-3.21.rst @@ -17,3 +17,9 @@ Pending removal in Python 3.21 are not generated by the parser or accepted by the code generator. * The ``dims`` property of ``ast.Tuple`` will be removed in Python 3.21. Use the ``ast.Tuple.elts`` property instead. + +* :mod:`struct`: + + * Soft-deprecated since Python 3.15, using ``'F'`` and ``'D'`` type codes are now + deprecated. These codes will be removed in Python 3.21. Use instead + two-letter forms ``'Zf'`` and ``'Zd'``. diff --git a/Doc/deprecations/soft-deprecations.rst b/Doc/deprecations/soft-deprecations.rst index d1dd2b2d8c520d6..a270052788ef2a1 100644 --- a/Doc/deprecations/soft-deprecations.rst +++ b/Doc/deprecations/soft-deprecations.rst @@ -19,8 +19,3 @@ There are no plans to remove :term:`soft deprecated` APIs. (Contributed by Gregory P. Smith in :gh:`86519` and Hugo van Kemenade in :gh:`148100`.) - -* Using ``'F'`` and ``'D'`` format type codes of the :mod:`struct` module - now are :term:`soft deprecated` in favor of two-letter forms ``'Zf'`` - and ``'Zd'``. - (Contributed by Sergey B Kirpichev in :gh:`121249`.) diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst index 775e5b2074851b7..ed5a719028d60ef 100644 --- a/Doc/library/struct.rst +++ b/Doc/library/struct.rst @@ -283,7 +283,9 @@ platform-dependent. .. versionchanged:: 3.15 Added support for the ``'Zf'`` and ``'Zd'`` formats. - ``'F'`` and ``'D'`` formats are :term:`soft deprecated`. + +.. versionchanged:: 3.16 + ``'F'`` and ``'D'`` formats are deprecated. .. seealso:: diff --git a/Doc/whatsnew/3.16.rst b/Doc/whatsnew/3.16.rst index e215d4ddfdf41b7..1a73a79a58b78b1 100644 --- a/Doc/whatsnew/3.16.rst +++ b/Doc/whatsnew/3.16.rst @@ -550,6 +550,13 @@ New deprecations 3.9, now issues a deprecation warning on use. This property is slated for removal in 3.21. Use ``ast.Tuple.elts`` instead. +* :mod:`struct`: + + * Soft-deprecated since Python 3.15, using ``'F'`` and ``'D'`` type codes are now + deprecated. These codes will be removed in Python 3.21. Use instead + two-letter forms ``'Zf'`` and ``'Zd'``. + (Contributed by Sergey B Kirpichev in :gh:`121249`.) + .. Add deprecations above alphabetically, not here at the end. .. include:: ../deprecations/pending-removal-in-3.17.rst diff --git a/Lib/test/test_ctypes/test_byteswap.py b/Lib/test/test_ctypes/test_byteswap.py index 6a1bae14773d277..1351b3e6bd2fa46 100644 --- a/Lib/test/test_ctypes/test_byteswap.py +++ b/Lib/test/test_ctypes/test_byteswap.py @@ -178,14 +178,14 @@ def test_endian_float_complex(self): self.assertIs(c_float_complex.__ctype_le__.__ctype_be__, c_float_complex) s = c_float_complex(math.pi+1j) - self.assertEqual(bin(struct.pack("F", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack("Zf", math.pi+1j)), bin(s)) self.assertAlmostEqual(s.value, math.pi+1j, places=6) s = c_float_complex.__ctype_le__(math.pi+1j) self.assertAlmostEqual(s.value, math.pi+1j, places=6) - self.assertEqual(bin(struct.pack("<F", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack("<Zf", math.pi+1j)), bin(s)) s = c_float_complex.__ctype_be__(math.pi+1j) self.assertAlmostEqual(s.value, math.pi+1j, places=6) - self.assertEqual(bin(struct.pack(">F", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack(">Zf", math.pi+1j)), bin(s)) @unittest.skipUnless(hasattr(ctypes, 'c_double_complex'), "No complex types") def test_endian_double_complex(self): @@ -199,14 +199,14 @@ def test_endian_double_complex(self): self.assertIs(c_double_complex.__ctype_le__.__ctype_be__, c_double_complex) s = c_double_complex(math.pi+1j) - self.assertEqual(bin(struct.pack("D", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack("Zd", math.pi+1j)), bin(s)) self.assertAlmostEqual(s.value, math.pi+1j, places=6) s = c_double_complex.__ctype_le__(math.pi+1j) self.assertAlmostEqual(s.value, math.pi+1j, places=6) - self.assertEqual(bin(struct.pack("<D", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack("<Zd", math.pi+1j)), bin(s)) s = c_double_complex.__ctype_be__(math.pi+1j) self.assertAlmostEqual(s.value, math.pi+1j, places=6) - self.assertEqual(bin(struct.pack(">D", math.pi+1j)), bin(s)) + self.assertEqual(bin(struct.pack(">Zd", math.pi+1j)), bin(s)) def test_endian_other(self): self.assertIs(c_byte.__ctype_le__, c_byte) diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py index f71b6f53486509b..df5ab9f2c879ca3 100644 --- a/Lib/test/test_memoryview.py +++ b/Lib/test/test_memoryview.py @@ -717,8 +717,8 @@ def test_half_float(self): self.assertListEqual(half_view.tolist(), float_view.tolist()) def test_complex_types(self): - float_complex_data = struct.pack('FFF', 0.0, -1.5j, 1+2j) - double_complex_data = struct.pack('DDD', 0.0, -1.5j, 1+2j) + float_complex_data = struct.pack('ZfZfZf', 0.0, -1.5j, 1+2j) + double_complex_data = struct.pack('ZdZdZd', 0.0, -1.5j, 1+2j) float_complex_view = memoryview(float_complex_data).cast('Zf') double_complex_view = memoryview(double_complex_data).cast('Zd') self.assertEqual(float_complex_view.nbytes * 2, double_complex_view.nbytes) diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index edd85df633fc3bb..f9803abb3db91fa 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -7,6 +7,7 @@ import unittest import struct import sys +import warnings import weakref from test import support @@ -995,14 +996,26 @@ def test_c_complex_round_trip(self): values = [complex(*_) for _ in combinations([1, -1, 0.0, -0.0, 2, -3, INF, -INF, NAN], 2)] for z in values: - for f in [ - 'F', 'D', 'Zf', 'Zd', - '>F', '>D', '>Zf', '>Zd', - '<F', '<D', '<Zf', '<Zd', - ]: + for f in ['Zf', 'Zd', '>Zf', '>Zd', '<Zf', '<Zd']: with self.subTest(z=z, format=f): round_trip = struct.unpack(f, struct.pack(f, z))[0] self.assertComplexesAreIdentical(z, round_trip) + z = 1+1j + for fmt in ['F', 'D', '>F', '>D', '<F', '<D']: + with self.subTest(format=fmt): + with warnings.catch_warnings(): + warnings.simplefilter("error", DeprecationWarning) + self.assertRaises(DeprecationWarning, struct.pack, fmt, z) + with warnings.catch_warnings(): + with self.assertWarns(DeprecationWarning): + b = struct.pack(fmt, z) + + with warnings.catch_warnings(): + warnings.simplefilter("error", DeprecationWarning) + self.assertRaises(DeprecationWarning, struct.unpack, fmt, b) + with self.assertWarns(DeprecationWarning): + round_trip = struct.unpack(fmt, b)[0] + self.assertComplexesAreIdentical(z, round_trip) @unittest.skipIf( support.is_android or support.is_apple_mobile, diff --git a/Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst b/Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst new file mode 100644 index 000000000000000..0e676e7774d1d7a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst @@ -0,0 +1 @@ +Deprecate using ``'F'`` and ``'D'`` type codes in the :mod:`struct` module. diff --git a/Modules/_struct.c b/Modules/_struct.c index 8c611a708d02a9d..6bf3993439cf1d7 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1697,6 +1697,21 @@ prepare_s(PyStructObject *self, PyObject *format) if (e == NULL) return -1; + if (strcmp(e->format, "F") == 0) { + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "The 'F' type code is deprecated, use 'Zf'", 1)) + { + return -1; + } + } + if (strcmp(e->format, "D") == 0) { + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "The 'D' type code is deprecated, use 'Zd'", 1)) + { + return -1; + } + } + switch (c) { case 's': _Py_FALLTHROUGH; case 'p': @@ -2065,6 +2080,20 @@ s_unpack_internal(PyStructObject *soself, const char *startfrom, } v = PyBytes_FromStringAndSize(res + 1, n); } else { + if (strcmp(e->format, "F") == 0) { + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "The 'F' type code is deprecated, use 'Zf'", 1)) + { + goto fail; + } + } + if (strcmp(e->format, "D") == 0) { + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "The 'D' type code is deprecated, use 'Zd'", 1)) + { + goto fail; + } + } v = e->unpack(state, res, e); } if (v == NULL)

1 0

gh-152192: Fix JUMP_BACKWARD passing a truncated oparg to the jit tracer (GH-152382)
by markshannon June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/9e10f14b925562a0292c920608e24f89ee… commit: 9e10f14b925562a0292c920608e24f89ee5f187e branch: main author: Timofei <128279579+deadlovelll(a)users.noreply.github.com> committer: markshannon <Mark.Shannon(a)arm.com> date: 2026-06-30T10:46:59+01:00 summary: gh-152192: Fix JUMP_BACKWARD passing a truncated oparg to the jit tracer (GH-152382) files: A Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-22-38-21.gh-issue-152192.lX2jIM.rst M Lib/test/test_capi/test_opt.py M Modules/_testinternalcapi/test_cases.c.h M Python/bytecodes.c M Python/generated_cases.c.h diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 2248920c266aef5..25b2c393e6773de 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1,4 +1,5 @@ import contextlib +import dis import itertools import sys import textwrap @@ -247,6 +248,28 @@ def many_vars(): self.assertTrue(any((opcode, oparg, operand) == ("_LOAD_FAST_BORROW", 259, 0) for opcode, oparg, _, operand in list(ex))) + def test_jump_backward_extended_arg(self): + # gh-152192: a JUMP_BACKWARD that needs an EXTENDED_ARG must record its + # deopt target at the EXTENDED_ARG, not the JUMP_BACKWARD. + ns = {} + src = ("def f(n):\n" + " i = 0\n" + " while i < n:\n" + " i += 1\n" + + "".join(f" a = {j}\n" for j in range(140))) + exec(src, ns) + f = ns["f"] + + instrs = list(dis.get_instructions(f)) + ext, jb = next((p, i) for p, i in zip(instrs, instrs[1:]) + if i.opname == "JUMP_BACKWARD" and p.opname == "EXTENDED_ARG") + + f(TIER2_THRESHOLD + 1) + ex = _opcode.get_executor(f.__code__, ext.offset) + set_ips = {t for op, _, t, _ in ex if op == "_SET_IP"} + self.assertIn(ext.offset // 2, set_ips) + self.assertNotIn(jb.offset // 2, set_ips) + def test_unspecialized_unpack(self): # An example of an unspecialized opcode def testfunc(x): diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-22-38-21.gh-issue-152192.lX2jIM.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-22-38-21.gh-issue-152192.lX2jIM.rst new file mode 100644 index 000000000000000..153cbeb317a2452 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-26-22-38-21.gh-issue-152192.lX2jIM.rst @@ -0,0 +1,2 @@ +Fix a truncated ``oparg`` being passed to JIT trace initialization for a +``JUMP_BACKWARD`` with an ``EXTENDED_ARG``. diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index fdc077c9549a144..51234e8749de261 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -8582,8 +8582,7 @@ (this_instr->op.code == JUMP_BACKWARD_JIT || is_resume)) && next_instr->op.code != ENTER_EXECUTOR) { _Py_CODEUNIT *insert_exec_at = this_instr; - while (oparg > 255) { - oparg >>= 8; + for (int tmp = oparg; tmp > 255; tmp >>= 8) { insert_exec_at--; } int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, @@ -11575,8 +11574,7 @@ (this_instr->op.code == JUMP_BACKWARD_JIT || is_resume)) && next_instr->op.code != ENTER_EXECUTOR) { _Py_CODEUNIT *insert_exec_at = this_instr; - while (oparg > 255) { - oparg >>= 8; + for (int tmp = oparg; tmp > 255; tmp >>= 8) { insert_exec_at--; } int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 31596e0bc7a31d2..7fb48516e2eae73 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -3560,8 +3560,8 @@ dummy_func( next_instr->op.code != ENTER_EXECUTOR) { /* Back up over EXTENDED_ARGs so executor is inserted at the correct place */ _Py_CODEUNIT *insert_exec_at = this_instr; - while (oparg > 255) { - oparg >>= 8; + // gh-152192: count with a temporary. oparg must stay intact, it's passed to the tracer below + for (int tmp = oparg; tmp > 255; tmp >>= 8) { insert_exec_at--; } int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 0da86abed67f63b..4b472aecc5fc3aa 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -8581,8 +8581,7 @@ (this_instr->op.code == JUMP_BACKWARD_JIT || is_resume)) && next_instr->op.code != ENTER_EXECUTOR) { _Py_CODEUNIT *insert_exec_at = this_instr; - while (oparg > 255) { - oparg >>= 8; + for (int tmp = oparg; tmp > 255; tmp >>= 8) { insert_exec_at--; } int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, @@ -11572,8 +11571,7 @@ (this_instr->op.code == JUMP_BACKWARD_JIT || is_resume)) && next_instr->op.code != ENTER_EXECUTOR) { _Py_CODEUNIT *insert_exec_at = this_instr; - while (oparg > 255) { - oparg >>= 8; + for (int tmp = oparg; tmp > 255; tmp >>= 8) { insert_exec_at--; } int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at,

1 0

Don't require the `_test{internal}capi` modules in `test_monitoring.py` (#152311)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/189ab8388762c8102b2d72ad3a1a921f7f… commit: 189ab8388762c8102b2d72ad3a1a921f7f2aef10 branch: main author: Shahar Naveh <50263213+ShaharNaveh(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T11:27:51+02:00 summary: Don't require the `_test{internal}capi` modules in `test_monitoring.py` (#152311) Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Lib/test/test_monitoring.py diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py index b8861d09e1564b..5c2d69934b02ea 100644 --- a/Lib/test/test_monitoring.py +++ b/Lib/test/test_monitoring.py @@ -14,9 +14,6 @@ import test.support from test.support import import_helper, requires_specialization, script_helper -_testcapi = import_helper.import_module("_testcapi") -_testinternalcapi = import_helper.import_module("_testinternalcapi") - PAIR = (0,1) def f1(): @@ -867,6 +864,8 @@ def test_implicit_stop_iteration(self): This test checks that both paths record an equivalent event. """ + _testinternalcapi = import_helper.import_module("_testinternalcapi") + def gen(): yield 1 return 2 @@ -1034,6 +1033,8 @@ def func(): @requires_specialization def test_no_unwind_for_shim_frame(self): + _testinternalcapi = import_helper.import_module("_testinternalcapi") + class ValueErrorRaiser: def __init__(self): raise ValueError() @@ -2455,6 +2456,7 @@ def run(): sys.monitoring.set_events(TEST_TOOL, 0) def test_108390(self): + _testinternalcapi = import_helper.import_module("_testinternalcapi") class Foo: def __init__(self, set_event): @@ -2546,6 +2548,8 @@ def test_func(x): class TestTier2Optimizer(CheckEvents): def test_monitoring_already_opimized_loop(self): + _testinternalcapi = import_helper.import_module("_testinternalcapi") + def test_func(recorder): set_events = sys.monitoring.set_events line = E.LINE @@ -2582,18 +2586,20 @@ class TestCApiEventGeneration(MonitoringTestBase, unittest.TestCase): class Scope: def __init__(self, *args): + self._testcapi = import_helper.import_module("_testcapi") self.args = args def __enter__(self): - _testcapi.monitoring_enter_scope(*self.args) + self._testcapi.monitoring_enter_scope(*self.args) def __exit__(self, *args): - _testcapi.monitoring_exit_scope() + self._testcapi.monitoring_exit_scope() def setUp(self): super(TestCApiEventGeneration, self).setUp() - capi = _testcapi + self._testcapi = import_helper.import_module("_testcapi") + capi = self._testcapi self.codelike = capi.CodeLike(2) @@ -2662,7 +2668,7 @@ def __call__(self, *args): def test_fire_event(self): for expected, event, function, *args in self.cases: offset = 0 - self.codelike = _testcapi.CodeLike(1) + self.codelike = self._testcapi.CodeLike(1) with self.subTest(function.__name__): args_ = (self.codelike, offset) + tuple(args) self.check_event_count(event, function, args_, expected) @@ -2673,7 +2679,7 @@ def test_missing_exception(self): continue assert args and isinstance(args[-1], BaseException) offset = 0 - self.codelike = _testcapi.CodeLike(1) + self.codelike = self._testcapi.CodeLike(1) with self.subTest(function.__name__): args_ = (self.codelike, offset) + tuple(args[:-1]) + (None,) evt = int(math.log2(event)) @@ -2683,7 +2689,7 @@ def test_missing_exception(self): def test_fire_event_failing_callback(self): for expected, event, function, *args in self.cases: offset = 0 - self.codelike = _testcapi.CodeLike(1) + self.codelike = self._testcapi.CodeLike(1) with self.subTest(function.__name__): args_ = (self.codelike, offset) + tuple(args) exc = OSError(42) @@ -2733,12 +2739,14 @@ def check_disable(self, event, func, args, expected): def test_disable_event(self): for expected, event, function, *args in self.cases: offset = 0 - self.codelike = _testcapi.CodeLike(2) + self.codelike = self._testcapi.CodeLike(2) with self.subTest(function.__name__): args_ = (self.codelike, 0) + tuple(args) self.check_disable(event, function, args_, expected) def test_enter_scope_two_events(self): + _testcapi = self._testcapi + try: yield_counter = CounterWithDisable() unwind_counter = CounterWithDisable()

1 0

gh-50966: Fix unbounded recursion in turtle drag handlers (GH-152626)
by serhiy-storchaka June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/6f103fab178c07cbb5f701b8ad97e275b6… commit: 6f103fab178c07cbb5f701b8ad97e275b6eb6c4c branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-30T12:19:43+03:00 summary: gh-50966: Fix unbounded recursion in turtle drag handlers (GH-152626) TurtleScreenBase._update() redraws with cv.update(), which also reprocesses input events, so a handler that moves the turtle (such as screen.ondrag(turtle.goto)) reenters _update() for every queued event until the interpreter crashes. A reentrant _update() now only flushes drawing with update_idletasks(). Co-authored-by: Claude Opus 4.8 <noreply(a)anthropic.com> files: A Misc/NEWS.d/next/Library/2026-06-29-22-16-57.gh-issue-50966.Tq5mLp.rst M Lib/test/test_turtle.py M Lib/turtle.py diff --git a/Lib/test/test_turtle.py b/Lib/test/test_turtle.py index 12d2eed874148c..c49ce9cdb6f6d9 100644 --- a/Lib/test/test_turtle.py +++ b/Lib/test/test_turtle.py @@ -577,6 +577,28 @@ def test_no_animation_calls_update_at_exit(self): s.update.assert_not_called() s.update.assert_called_once() + def test_update_is_not_reentrant(self): + # ondrag(goto) reenters _update() while cv.update() processes events; + # without a guard this recurses without bound (gh-50966). + s = turtle.TurtleScreen(cv=unittest.mock.MagicMock()) + depth = max_depth = 0 + + def reenter(): + nonlocal depth, max_depth + depth += 1 + max_depth = max(max_depth, depth) + if depth < 50: + s._update() # as an event handler would + depth -= 1 + + s.cv.update.reset_mock() # ignore calls made during construction + s.cv.update.side_effect = reenter + s._update() + # cv.update() runs once; reentrant calls only flush idle tasks. + self.assertEqual(s.cv.update.call_count, 1) + self.assertEqual(max_depth, 1) + self.assertTrue(s.cv.update_idletasks.called) + class TestTurtle(unittest.TestCase): def setUp(self): diff --git a/Lib/turtle.py b/Lib/turtle.py index ae5be9fe7039d5..af2c7448a0af17 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -486,6 +486,7 @@ def __init__(self, cv): self.canvwidth = w self.canvheight = h self.xscale = self.yscale = 1.0 + self._updating = False def _createpoly(self): """Create an invisible polygon item on canvas self.cv) @@ -555,7 +556,16 @@ def _delete(self, item): def _update(self): """Redraw graphics items on canvas """ - self.cv.update() + if self._updating: + # Reentrant call (e.g. a drag handler moving the turtle, + # gh-50966): flush drawing without reprocessing input. + self.cv.update_idletasks() + return + self._updating = True + try: + self.cv.update() + finally: + self._updating = False def _delay(self, delay): """Delay subsequent canvas actions for delay ms.""" diff --git a/Misc/NEWS.d/next/Library/2026-06-29-22-16-57.gh-issue-50966.Tq5mLp.rst b/Misc/NEWS.d/next/Library/2026-06-29-22-16-57.gh-issue-50966.Tq5mLp.rst new file mode 100644 index 00000000000000..96a0938c02d226 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-06-29-22-16-57.gh-issue-50966.Tq5mLp.rst @@ -0,0 +1,3 @@ +Fix unbounded recursion in :mod:`turtle` when a mouse event handler that moves +the turtle is reentered while the screen is being redrawn, for example with +``screen.ondrag(turtle.goto)``. This could previously crash the interpreter.

1 0

[3.15] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152656)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/3b1f6eef837c2e4ab364aed12f23bbc12b… commit: 3b1f6eef837c2e4ab364aed12f23bbc12b513a6d branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T09:16:59Z summary: [3.15] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152656) (cherry picked from commit 77181570da2d6d8f7bfca39f438ef0a893a30567) Co-authored-by: xzkdeng <xzkdeng(a)gmail.com> Co-authored-by: sobolevn <mail(a)sobolevn.me> Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Doc/faq/design.rst diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index ac0aa81e56bb07a..c914089e9806ec6 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -263,6 +263,8 @@ In general, structured switch statements execute one block of code when an expression has a particular value or set of values. Since Python 3.10 one can easily match literal values, or constants within a namespace, with a ``match ... case`` statement. +See :ref:`the specification <match>` and :ref:`the tutorial <tut-match>` +for more information about :keyword:`match` statements. An older alternative is a sequence of ``if... elif... elif... else``. For cases where you need to choose from a very large number of possibilities,

1 0

[3.14] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152655)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/3d6c29158e0d79ed325670e6ccb4592363… commit: 3d6c29158e0d79ed325670e6ccb4592363c2a358 branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T09:16:51Z summary: [3.14] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152655) (cherry picked from commit 77181570da2d6d8f7bfca39f438ef0a893a30567) Co-authored-by: xzkdeng <xzkdeng(a)gmail.com> Co-authored-by: sobolevn <mail(a)sobolevn.me> Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Doc/faq/design.rst diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index 73c670b0a138c2b..3872a9ab9364f99 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -263,6 +263,8 @@ In general, structured switch statements execute one block of code when an expression has a particular value or set of values. Since Python 3.10 one can easily match literal values, or constants within a namespace, with a ``match ... case`` statement. +See :ref:`the specification <match>` and :ref:`the tutorial <tut-match>` +for more information about :keyword:`match` statements. An older alternative is a sequence of ``if... elif... elif... else``. For cases where you need to choose from a very large number of possibilities,

1 0

[3.13] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152654)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/d1ae6431c7896f595082e403f780c4441b… commit: d1ae6431c7896f595082e403f780c4441b2ea0df branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T09:15:08Z summary: [3.13] gh-133510: Add links to more info for the match statement in FAQ anwser (GH-133511) (#152654) (cherry picked from commit 77181570da2d6d8f7bfca39f438ef0a893a30567) Co-authored-by: xzkdeng <xzkdeng(a)gmail.com> Co-authored-by: sobolevn <mail(a)sobolevn.me> Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Doc/faq/design.rst diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index 73c670b0a138c2b..3872a9ab9364f99 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -263,6 +263,8 @@ In general, structured switch statements execute one block of code when an expression has a particular value or set of values. Since Python 3.10 one can easily match literal values, or constants within a namespace, with a ``match ... case`` statement. +See :ref:`the specification <match>` and :ref:`the tutorial <tut-match>` +for more information about :keyword:`match` statements. An older alternative is a sequence of ``if... elif... elif... else``. For cases where you need to choose from a very large number of possibilities,

1 0

gh-152325: Gate curses.has_mouse() on the ncurses patch level (GH-152652)
by serhiy-storchaka June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/11d42bd269788a0dd9ff954b63d7fd7139… commit: 11d42bd269788a0dd9ff954b63d7fd7139c3e46f branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-30T09:09:09Z summary: gh-152325: Gate curses.has_mouse() on the ncurses patch level (GH-152652) has_mouse() was added to ncurses after the 5.7 release, but the binding guarded it only with NCURSES_MOUSE_VERSION, which 5.7 already defines, so the module failed to compile against ncurses 5.7 (such as the system curses on macOS). Gate it additionally on NCURSES_EXT_FUNCS, which holds the library's patch date. Co-authored-by: Claude Opus 4.8 <noreply(a)anthropic.com> files: M Doc/library/curses.rst M Modules/_cursesmodule.c M Modules/clinic/_cursesmodule.c.h diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst index b3341fb8629f4c..7178325e708bc1 100644 --- a/Doc/library/curses.rst +++ b/Doc/library/curses.rst @@ -465,6 +465,8 @@ Mouse Return ``True`` if the mouse driver has been successfully initialized. + Availability: ncurses 5.8 or later. + .. versionadded:: next diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index cbd45216968470..dc373c8cef932c 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -7041,6 +7041,8 @@ _curses_meta_impl(PyObject *module, int yes) } #ifdef NCURSES_MOUSE_VERSION +/* has_mouse() was added to ncurses after the 5.7 release. */ +#if defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >= 20081122 /*[clinic input] _curses.has_mouse @@ -7055,6 +7057,7 @@ _curses_has_mouse_impl(PyObject *module) return PyBool_FromLong(has_mouse()); } +#endif /* NCURSES_EXT_FUNCS >= 20081122 */ /*[clinic input] _curses.mouseinterval diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h index 78619842f97fd7..e69be47549cf65 100644 --- a/Modules/clinic/_cursesmodule.c.h +++ b/Modules/clinic/_cursesmodule.c.h @@ -4232,7 +4232,7 @@ _curses_meta(PyObject *module, PyObject *arg) return return_value; } -#if defined(NCURSES_MOUSE_VERSION) +#if defined(NCURSES_MOUSE_VERSION) && (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >= 20081122) PyDoc_STRVAR(_curses_has_mouse__doc__, "has_mouse($module, /)\n" @@ -4252,7 +4252,7 @@ _curses_has_mouse(PyObject *module, PyObject *Py_UNUSED(ignored)) return _curses_has_mouse_impl(module); } -#endif /* defined(NCURSES_MOUSE_VERSION) */ +#endif /* defined(NCURSES_MOUSE_VERSION) && (defined(NCURSES_EXT_FUNCS) && NCURSES_EXT_FUNCS >= 20081122) */ #if defined(NCURSES_MOUSE_VERSION) @@ -6174,4 +6174,4 @@ _curses_has_extended_color_support(PyObject *module, PyObject *Py_UNUSED(ignored #ifndef _CURSES_ASSUME_DEFAULT_COLORS_METHODDEF #define _CURSES_ASSUME_DEFAULT_COLORS_METHODDEF #endif /* !defined(_CURSES_ASSUME_DEFAULT_COLORS_METHODDEF) */ -/*[clinic end generated code: output=55829d2ef2b559a0 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=809e4680d429b870 input=a9049054013a1b77]*/

1 0

gh-133510: Add links to more info for the match statement in FAQ anwser (#133511)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/77181570da2d6d8f7bfca39f438ef0a893… commit: 77181570da2d6d8f7bfca39f438ef0a893a30567 branch: main author: xzkdeng <xzkdeng(a)gmail.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T11:08:39+02:00 summary: gh-133510: Add links to more info for the match statement in FAQ anwser (#133511) Co-authored-by: sobolevn <mail(a)sobolevn.me> Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland(a)users.noreply.github.com> Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Doc/faq/design.rst diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index ac0aa81e56bb07a..c914089e9806ec6 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -263,6 +263,8 @@ In general, structured switch statements execute one block of code when an expression has a particular value or set of values. Since Python 3.10 one can easily match literal values, or constants within a namespace, with a ``match ... case`` statement. +See :ref:`the specification <match>` and :ref:`the tutorial <tut-match>` +for more information about :keyword:`match` statements. An older alternative is a sequence of ``if... elif... elif... else``. For cases where you need to choose from a very large number of possibilities,

1 0

[3.15] gh-152248: Reject a POSIX TZ abbreviation with non-ASCII-letters in pure-Python `zoneinfo` (GH-152249) (#152650)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/59616023b19a722b756f27f31af82f63f7… commit: 59616023b19a722b756f27f31af82f63f7e449d5 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T08:57:58Z summary: [3.15] gh-152248: Reject a POSIX TZ abbreviation with non-ASCII-letters in pure-Python `zoneinfo` (GH-152249) (#152650) (cherry picked from commit 449122ed0dbdb6a545af4927c59f4c80ee15c515) Co-authored-by: tonghuaroot (童话) <tonghuaroot(a)gmail.com> Co-authored-by: Stan Ulbrych <stan(a)python.org> files: A Misc/NEWS.d/next/Library/2026-06-26-13-39-11.gh-issue-152248.N2Rmaf.rst M Lib/test/test_zoneinfo/test_zoneinfo.py M Lib/zoneinfo/_zoneinfo.py M Modules/_zoneinfo.c diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py index cf3f82db75b0b60..813b56501308f9e 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo.py @@ -1009,14 +1009,14 @@ def populate_tzstr_header(cls): cls._tzif_header = bytes(out) - def zone_from_tzstr(self, tzstr): + def zone_from_tzstr(self, tzstr, encoding="ascii"): """Creates a zoneinfo file following a POSIX rule.""" zonefile = io.BytesIO(self._tzif_header) zonefile.seek(0, 2) # Write the footer zonefile.write(b"\x0A") - zonefile.write(tzstr.encode("ascii")) + zonefile.write(tzstr.encode(encoding)) zonefile.write(b"\x0A") zonefile.seek(0) @@ -1150,6 +1150,13 @@ def test_invalid_tzstr(self): "+11", # Unquoted alphanumeric "GMT,M3.2.0/2,M11.1.0/3", # Transition rule but no DST "GMT0+11,M3.2.0/2,M11.1.0/3", # Unquoted alphanumeric in DST + # Unquoted abbreviation with embedded or leading whitespace + "AB C3", + " A B 3", + "AAA4BB B,J60/2,J300/2", # Embedded whitespace in DST + # Empty quoted abbreviation + "<>5", + "AAA4<>,M3.2.0/2,M11.1.0/3", "PST8PDT,M3.2.0/2", # Only one transition rule # Invalid offset hours "AAA168", @@ -1232,6 +1239,15 @@ def test_invalid_tzstr(self): with self.assertRaisesRegex(ValueError, tzstr_regex): self.zone_from_tzstr(invalid_tzstr) + def test_invalid_tzstr_non_ascii_abbr(self): + tzstr = "ABÀC3" + if self.module is py_zoneinfo: + expected = re.escape(tzstr) + else: + expected = re.escape(repr(tzstr.encode("utf-8"))) + with self.assertRaisesRegex(ValueError, expected): + self.zone_from_tzstr(tzstr, encoding="utf-8") + @classmethod def _populate_test_cases(cls): # This method uses a somewhat unusual style in that it populates the diff --git a/Lib/zoneinfo/_zoneinfo.py b/Lib/zoneinfo/_zoneinfo.py index 52832f600c30448..90cf2bbf8f5d0d1 100644 --- a/Lib/zoneinfo/_zoneinfo.py +++ b/Lib/zoneinfo/_zoneinfo.py @@ -640,11 +640,11 @@ def _parse_tz_str(tz_str): parser_re = re.compile( r""" - (?P<std>[^<0-9:.+-]+|<[a-zA-Z0-9+-]+>) + (?P<std>[a-zA-Z]+|<[a-zA-Z0-9+-]+>) (?: (?P<stdoff>[+-]?\d{1,3}(?::\d{2}(?::\d{2})?)?) (?: - (?P<dst>[^0-9:.+-]+|<[a-zA-Z0-9+-]+>) + (?P<dst>[a-zA-Z]+|<[a-zA-Z0-9+-]+>) (?P<dstoff>[+-]?\d{1,3}(?::\d{2}(?::\d{2})?)?)? )? # dst )? # stdoff diff --git a/Misc/NEWS.d/next/Library/2026-06-26-13-39-11.gh-issue-152248.N2Rmaf.rst b/Misc/NEWS.d/next/Library/2026-06-26-13-39-11.gh-issue-152248.N2Rmaf.rst new file mode 100644 index 000000000000000..8921ad17349e975 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-06-26-13-39-11.gh-issue-152248.N2Rmaf.rst @@ -0,0 +1,3 @@ +Make the C and pure-Python :mod:`zoneinfo` parsers validate POSIX TZ +abbreviations consistently, rejecting unquoted abbreviations with non-letter +characters and empty quoted abbreviations. Patch by tonghuaroot. diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c index eaffd020ed97c09..2a7ac4498261e08 100644 --- a/Modules/_zoneinfo.c +++ b/Modules/_zoneinfo.c @@ -1762,6 +1762,9 @@ parse_abbr(const char **p, PyObject **abbr) ptr++; } str_end = ptr; + if (str_end == str_start) { + return -1; + } ptr++; } else {

1 0