[3.10] bpo-45826: Fix a crash in suggestions.c by checking for `traceback is None` (GH-29590) (GH-29602)
(cherry picked from commit 5d90c467c02ffefdb13c1abc83a171db1a99ffad)
Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 4930c57..8419f58 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1885,6 +1885,37 @@ def foo():
self.assertNotIn("something", err.getvalue())
+ def test_issue45826(self):
+ # regression test for bpo-45826
+ def f():
+ with self.assertRaisesRegex(NameError, 'aaa'):
+ aab
+
+ try:
+ f()
+ except self.failureException:
+ with support.captured_stderr() as err:
+ sys.__excepthook__(*sys.exc_info())
+
+ self.assertIn("aab", err.getvalue())
+
+ def test_issue45826_focused(self):
+ def f():
+ try:
+ nonsense
+ except BaseException as E:
+ E.with_traceback(None)
+ raise ZeroDivisionError()
+
+ try:
+ f()
+ except ZeroDivisionError:
+ with support.captured_stderr() as err:
+ sys.__excepthook__(*sys.exc_info())
+
+ self.assertIn("nonsense", err.getvalue())
+ self.assertIn("ZeroDivisionError", err.getvalue())
+
class AttributeErrorTests(unittest.TestCase):
def test_attributes(self):