Mailman 3 March 2025 - Python-checkins

Revert "gh-128364: Fix flaky `test_timeout` test (gh-130724)" (gh-130732)
by colesbury March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/5221d9ce0e2beb0fe04bed072e1bb448fd… commit: 5221d9ce0e2beb0fe04bed072e1bb448fd522882 branch: main author: Sam Gross <colesbury(a)gmail.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-01T17:22:13Z summary: Revert "gh-128364: Fix flaky `test_timeout` test (gh-130724)" (gh-130732) Change broke Android and iOS buildbots that do not have multiprocessing. This reverts commit cfa0b1dc375e63cde28e61a47108c645b0e74834. files: M Lib/test/test_concurrent_futures/test_wait.py M Lib/test/test_concurrent_futures/util.py diff --git a/Lib/test/test_concurrent_futures/test_wait.py b/Lib/test/test_concurrent_futures/test_wait.py index 697285779510a9..108cf54bf79e6f 100644 --- a/Lib/test/test_concurrent_futures/test_wait.py +++ b/Lib/test/test_concurrent_futures/test_wait.py @@ -114,8 +114,9 @@ def test_all_completed(self): def test_timeout(self): short_timeout = 0.050 + long_timeout = short_timeout * 10 - future = self.executor.submit(self.event.wait) + future = self.executor.submit(time.sleep, long_timeout) finished, pending = futures.wait( [CANCELLED_AND_NOTIFIED_FUTURE, @@ -131,9 +132,6 @@ def test_timeout(self): finished) self.assertEqual(set([future]), pending) - # Set the event to allow the future to complete - self.event.set() - class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase): diff --git a/Lib/test/test_concurrent_futures/util.py b/Lib/test/test_concurrent_futures/util.py index 4e9e4ef1daec03..44086217f9dbcb 100644 --- a/Lib/test/test_concurrent_futures/util.py +++ b/Lib/test/test_concurrent_futures/util.py @@ -1,6 +1,5 @@ import multiprocessing import sys -import threading import time import unittest from concurrent import futures @@ -47,14 +46,11 @@ def setUp(self): self.t1 = time.monotonic() if hasattr(self, "ctx"): - self.manager = multiprocessing.Manager() - self.event = self.manager.Event() self.executor = self.executor_type( max_workers=self.worker_count, mp_context=self.get_context(), **self.executor_kwargs) else: - self.event = threading.Event() self.executor = self.executor_type( max_workers=self.worker_count, **self.executor_kwargs) @@ -62,9 +58,6 @@ def setUp(self): def tearDown(self): self.executor.shutdown(wait=True) self.executor = None - if hasattr(self, "ctx"): - self.manager.shutdown() - self.manager = None dt = time.monotonic() - self.t1 if support.verbose:

1 0

[3.13] gh-128364: Fix flaky `test_timeout` test (gh-130724) (gh-130728)
by colesbury March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/5070864e161532a14a596c339d94712663… commit: 5070864e161532a14a596c339d94712663142c33 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-01T16:46:58Z summary: [3.13] gh-128364: Fix flaky `test_timeout` test (gh-130724) (gh-130728) gh-128364: Fix flaky `test_timeout` test (gh-130724) (cherry picked from commit cfa0b1dc375e63cde28e61a47108c645b0e74834) Co-authored-by: Sam Gross <colesbury(a)gmail.com> files: M Lib/test/test_concurrent_futures/test_wait.py M Lib/test/test_concurrent_futures/util.py diff --git a/Lib/test/test_concurrent_futures/test_wait.py b/Lib/test/test_concurrent_futures/test_wait.py index 108cf54bf79e6f..697285779510a9 100644 --- a/Lib/test/test_concurrent_futures/test_wait.py +++ b/Lib/test/test_concurrent_futures/test_wait.py @@ -114,9 +114,8 @@ def test_all_completed(self): def test_timeout(self): short_timeout = 0.050 - long_timeout = short_timeout * 10 - future = self.executor.submit(time.sleep, long_timeout) + future = self.executor.submit(self.event.wait) finished, pending = futures.wait( [CANCELLED_AND_NOTIFIED_FUTURE, @@ -132,6 +131,9 @@ def test_timeout(self): finished) self.assertEqual(set([future]), pending) + # Set the event to allow the future to complete + self.event.set() + class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase): diff --git a/Lib/test/test_concurrent_futures/util.py b/Lib/test/test_concurrent_futures/util.py index 3b8ec3e205d5aa..daadb8459c3161 100644 --- a/Lib/test/test_concurrent_futures/util.py +++ b/Lib/test/test_concurrent_futures/util.py @@ -1,5 +1,6 @@ import multiprocessing import sys +import threading import time import unittest from concurrent import futures @@ -46,11 +47,14 @@ def setUp(self): self.t1 = time.monotonic() if hasattr(self, "ctx"): + self.manager = multiprocessing.Manager() + self.event = self.manager.Event() self.executor = self.executor_type( max_workers=self.worker_count, mp_context=self.get_context(), **self.executor_kwargs) else: + self.event = threading.Event() self.executor = self.executor_type( max_workers=self.worker_count, **self.executor_kwargs) @@ -58,6 +62,9 @@ def setUp(self): def tearDown(self): self.executor.shutdown(wait=True) self.executor = None + if hasattr(self, "ctx"): + self.manager.shutdown() + self.manager = None dt = time.monotonic() - self.t1 if support.verbose:

1 0

[3.12] gh-128364: Fix flaky `test_timeout` test (gh-130724) (gh-130729)
by colesbury March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/27f9f2b98afccf8c67e6fbd68f6a3663c8… commit: 27f9f2b98afccf8c67e6fbd68f6a3663c84219fb branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-01T16:40:53Z summary: [3.12] gh-128364: Fix flaky `test_timeout` test (gh-130724) (gh-130729) gh-128364: Fix flaky `test_timeout` test (gh-130724) (cherry picked from commit cfa0b1dc375e63cde28e61a47108c645b0e74834) Co-authored-by: Sam Gross <colesbury(a)gmail.com> files: M Lib/test/test_concurrent_futures/test_wait.py M Lib/test/test_concurrent_futures/util.py diff --git a/Lib/test/test_concurrent_futures/test_wait.py b/Lib/test/test_concurrent_futures/test_wait.py index ff486202092c81..3527a74a708b20 100644 --- a/Lib/test/test_concurrent_futures/test_wait.py +++ b/Lib/test/test_concurrent_futures/test_wait.py @@ -114,9 +114,8 @@ def test_all_completed(self): def test_timeout(self): short_timeout = 0.050 - long_timeout = short_timeout * 10 - future = self.executor.submit(time.sleep, long_timeout) + future = self.executor.submit(self.event.wait) finished, pending = futures.wait( [CANCELLED_AND_NOTIFIED_FUTURE, @@ -132,6 +131,9 @@ def test_timeout(self): finished) self.assertEqual(set([future]), pending) + # Set the event to allow the future to complete + self.event.set() + class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase): diff --git a/Lib/test/test_concurrent_futures/util.py b/Lib/test/test_concurrent_futures/util.py index fc6030e375fb6b..93ae2459ac5237 100644 --- a/Lib/test/test_concurrent_futures/util.py +++ b/Lib/test/test_concurrent_futures/util.py @@ -1,5 +1,6 @@ import multiprocessing import sys +import threading import time import unittest from concurrent import futures @@ -46,11 +47,14 @@ def setUp(self): self.t1 = time.monotonic() if hasattr(self, "ctx"): + self.manager = multiprocessing.Manager() + self.event = self.manager.Event() self.executor = self.executor_type( max_workers=self.worker_count, mp_context=self.get_context(), **self.executor_kwargs) else: + self.event = threading.Event() self.executor = self.executor_type( max_workers=self.worker_count, **self.executor_kwargs) @@ -58,6 +62,9 @@ def setUp(self): def tearDown(self): self.executor.shutdown(wait=True) self.executor = None + if hasattr(self, "ctx"): + self.manager.shutdown() + self.manager = None dt = time.monotonic() - self.t1 if support.verbose:

1 0

gh-128364: Fix flaky `test_timeout` test (gh-130724)
by colesbury March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/cfa0b1dc375e63cde28e61a47108c645b0… commit: cfa0b1dc375e63cde28e61a47108c645b0e74834 branch: main author: Sam Gross <colesbury(a)gmail.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-01T16:20:43Z summary: gh-128364: Fix flaky `test_timeout` test (gh-130724) files: M Lib/test/test_concurrent_futures/test_wait.py M Lib/test/test_concurrent_futures/util.py diff --git a/Lib/test/test_concurrent_futures/test_wait.py b/Lib/test/test_concurrent_futures/test_wait.py index 108cf54bf79e6f..697285779510a9 100644 --- a/Lib/test/test_concurrent_futures/test_wait.py +++ b/Lib/test/test_concurrent_futures/test_wait.py @@ -114,9 +114,8 @@ def test_all_completed(self): def test_timeout(self): short_timeout = 0.050 - long_timeout = short_timeout * 10 - future = self.executor.submit(time.sleep, long_timeout) + future = self.executor.submit(self.event.wait) finished, pending = futures.wait( [CANCELLED_AND_NOTIFIED_FUTURE, @@ -132,6 +131,9 @@ def test_timeout(self): finished) self.assertEqual(set([future]), pending) + # Set the event to allow the future to complete + self.event.set() + class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase): diff --git a/Lib/test/test_concurrent_futures/util.py b/Lib/test/test_concurrent_futures/util.py index 44086217f9dbcb..4e9e4ef1daec03 100644 --- a/Lib/test/test_concurrent_futures/util.py +++ b/Lib/test/test_concurrent_futures/util.py @@ -1,5 +1,6 @@ import multiprocessing import sys +import threading import time import unittest from concurrent import futures @@ -46,11 +47,14 @@ def setUp(self): self.t1 = time.monotonic() if hasattr(self, "ctx"): + self.manager = multiprocessing.Manager() + self.event = self.manager.Event() self.executor = self.executor_type( max_workers=self.worker_count, mp_context=self.get_context(), **self.executor_kwargs) else: + self.event = threading.Event() self.executor = self.executor_type( max_workers=self.worker_count, **self.executor_kwargs) @@ -58,6 +62,9 @@ def setUp(self): def tearDown(self): self.executor.shutdown(wait=True) self.executor = None + if hasattr(self, "ctx"): + self.manager.shutdown() + self.manager = None dt = time.monotonic() - self.t1 if support.verbose:

1 0

gh-128974: Fix `UnicodeError.__str__` when custom attributes have side-effects (#128975)
by picnixz March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/ddc27f9c385f57db1c227b655ec84dcf09… commit: ddc27f9c385f57db1c227b655ec84dcf097a8976 branch: main author: Bénédikt Tran <10796600+picnixz(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-01T12:01:20+01:00 summary: gh-128974: Fix `UnicodeError.__str__` when custom attributes have side-effects (#128975) Fix some crashes when (custom) attributes of `UnicodeError` objects implement `object.__str__` with side-effects. files: A Misc/NEWS.d/next/Core_and_Builtins/2025-01-18-10-50-04.gh-issue-128974.KltI-A.rst M Lib/test/test_exceptions.py M Objects/exceptions.c diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index bf0bc53b634022..20c617f8108d5f 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -1360,6 +1360,43 @@ def test_unicode_error_str_does_not_crash(self): exc = UnicodeDecodeError('utf-8', encoded, start, end, '') self.assertIsInstance(str(exc), str) + def test_unicode_error_evil_str_set_none_object(self): + def side_effect(exc): + exc.object = None + self.do_test_unicode_error_mutate(side_effect) + + def test_unicode_error_evil_str_del_self_object(self): + def side_effect(exc): + del exc.object + self.do_test_unicode_error_mutate(side_effect) + + def do_test_unicode_error_mutate(self, side_effect): + # Test that str(UnicodeError(...)) does not crash when + # side-effects mutate the underlying 'object' attribute. + # See https://github.com/python/cpython/issues/128974. + + class Evil(str): + def __str__(self): + side_effect(exc) + return self + + for reason, encoding in [ + ("reason", Evil("utf-8")), + (Evil("reason"), "utf-8"), + (Evil("reason"), Evil("utf-8")), + ]: + with self.subTest(encoding=encoding, reason=reason): + with self.subTest(UnicodeEncodeError): + exc = UnicodeEncodeError(encoding, "x", 0, 1, reason) + self.assertRaises(TypeError, str, exc) + with self.subTest(UnicodeDecodeError): + exc = UnicodeDecodeError(encoding, b"x", 0, 1, reason) + self.assertRaises(TypeError, str, exc) + + with self.subTest(UnicodeTranslateError): + exc = UnicodeTranslateError("x", 0, 1, Evil("reason")) + self.assertRaises(TypeError, str, exc) + @no_tracing def test_badisinstance(self): # Bug #2542: if issubclass(e, MyException) raises an exception, diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-01-18-10-50-04.gh-issue-128974.KltI-A.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-01-18-10-50-04.gh-issue-128974.KltI-A.rst new file mode 100644 index 00000000000000..fc4453ae3f2644 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-01-18-10-50-04.gh-issue-128974.KltI-A.rst @@ -0,0 +1,3 @@ +Fix a crash in :meth:`UnicodeError.__str__ <object.__str__>` when custom +attributes implement :meth:`~object.__str__` with side-effects. +Patch by Bénédikt Tran. diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 28c7fdbd47ba8d..e30fea0f37a925 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2784,6 +2784,8 @@ SyntaxError_str(PyObject *op) if (!filename && !have_lineno) return PyObject_Str(self->msg ? self->msg : Py_None); + // Even if 'filename' can be an instance of a subclass of 'str', + // we only render its "true" content and do not use str(filename). if (filename && have_lineno) result = PyUnicode_FromFormat("%S (%U, line %ld)", self->msg ? self->msg : Py_None, @@ -2903,29 +2905,47 @@ SimpleExtendsException(PyExc_ValueError, UnicodeError, /* * Check the validity of 'attr' as a unicode or bytes object depending - * on 'as_bytes' and return a new reference on it if it is the case. + * on 'as_bytes'. * * The 'name' is the attribute name and is only used for error reporting. * - * On success, this returns a strong reference on 'attr'. - * On failure, this sets a TypeError and returns NULL. + * On success, this returns 0. + * On failure, this sets a TypeError and returns -1. */ -static PyObject * -as_unicode_error_attribute(PyObject *attr, const char *name, int as_bytes) +static int +check_unicode_error_attribute(PyObject *attr, const char *name, int as_bytes) { assert(as_bytes == 0 || as_bytes == 1); if (attr == NULL) { - PyErr_Format(PyExc_TypeError, "%s attribute not set", name); - return NULL; + PyErr_Format(PyExc_TypeError, + "UnicodeError '%s' attribute is not set", + name); + return -1; } if (!(as_bytes ? PyBytes_Check(attr) : PyUnicode_Check(attr))) { PyErr_Format(PyExc_TypeError, - "%s attribute must be %s", - name, - as_bytes ? "bytes" : "unicode"); - return NULL; + "UnicodeError '%s' attribute must be a %s", + name, as_bytes ? "bytes" : "string"); + return -1; } - return Py_NewRef(attr); + return 0; +} + + +/* + * Check the validity of 'attr' as a unicode or bytes object depending + * on 'as_bytes' and return a new reference on it if it is the case. + * + * The 'name' is the attribute name and is only used for error reporting. + * + * On success, this returns a strong reference on 'attr'. + * On failure, this sets a TypeError and returns NULL. + */ +static PyObject * +as_unicode_error_attribute(PyObject *attr, const char *name, int as_bytes) +{ + int rc = check_unicode_error_attribute(attr, name, as_bytes); + return rc < 0 ? NULL : Py_NewRef(attr); } @@ -3591,7 +3611,10 @@ UnicodeEncodeError_str(PyObject *self) if (encoding_str == NULL) { goto done; } - + // calls to PyObject_Str(...) above might mutate 'exc->object' + if (check_unicode_error_attribute(exc->object, "object", false) < 0) { + goto done; + } Py_ssize_t len = PyUnicode_GET_LENGTH(exc->object); Py_ssize_t start = exc->start, end = exc->end; @@ -3711,7 +3734,10 @@ UnicodeDecodeError_str(PyObject *self) if (encoding_str == NULL) { goto done; } - + // calls to PyObject_Str(...) above might mutate 'exc->object' + if (check_unicode_error_attribute(exc->object, "object", true) < 0) { + goto done; + } Py_ssize_t len = PyBytes_GET_SIZE(exc->object); Py_ssize_t start = exc->start, end = exc->end; @@ -3807,7 +3833,10 @@ UnicodeTranslateError_str(PyObject *self) if (reason_str == NULL) { goto done; } - + // call to PyObject_Str(...) above might mutate 'exc->object' + if (check_unicode_error_attribute(exc->object, "object", false) < 0) { + goto done; + } Py_ssize_t len = PyUnicode_GET_LENGTH(exc->object); Py_ssize_t start = exc->start, end = exc->end;

1 0