summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérome Perrin <perrinjerome@gmail.com>2024-01-16 09:49:24 (GMT)
committerGitHub <noreply@github.com>2024-01-16 09:49:24 (GMT)
commit04fabe22dd98b4d87f672254b743fbadd5206352 (patch)
tree3b86f3fbf608fde8b40ffe871337068159e4631c
parent17b73ab99ef12f89d41acec7500a244e68b1aaa4 (diff)
downloadcpython-04fabe22dd98b4d87f672254b743fbadd5206352.zip
cpython-04fabe22dd98b4d87f672254b743fbadd5206352.tar.gz
cpython-04fabe22dd98b4d87f672254b743fbadd5206352.tar.bz2
gh-113358: Fix rendering tracebacks with exceptions with a broken __getattr__ (GH-113359)
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
-rw-r--r--Lib/test/test_traceback.py14
-rw-r--r--Lib/traceback.py6
-rw-r--r--Misc/NEWS.d/next/Library/2023-12-21-14-55-06.gh-issue-113358.nRkiSL.rst1
3 files changed, 20 insertions, 1 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index a670811..372fc48 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -2209,6 +2209,20 @@ class BaseExceptionReportingTests:
err_msg = "b'please do not show me as numbers'"
self.assertEqual(self.get_report(e), vanilla + err_msg + '\n')
+ # an exception with a broken __getattr__ raising a non expected error
+ class BrokenException(Exception):
+ broken = False
+ def __getattr__(self, name):
+ if self.broken:
+ raise ValueError(f'no {name}')
+
+ e = BrokenException(123)
+ vanilla = self.get_report(e)
+ e.broken = True
+ self.assertEqual(
+ self.get_report(e),
+ vanilla + "Ignored error getting __notes__: ValueError('no __notes__')\n")
+
def test_exception_with_multiple_notes(self):
for e in [ValueError(42), SyntaxError('bad syntax')]:
with self.subTest(e=e):
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 30b42a4..d27c7a7 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -1051,7 +1051,11 @@ class TracebackException:
# Capture now to permit freeing resources: only complication is in the
# unofficial API _format_final_exc_line
self._str = _safe_string(exc_value, 'exception')
- self.__notes__ = getattr(exc_value, '__notes__', None)
+ try:
+ self.__notes__ = getattr(exc_value, '__notes__', None)
+ except Exception as e:
+ self.__notes__ = [
+ f'Ignored error getting __notes__: {_safe_string(e, '__notes__', repr)}']
self._is_syntax_error = False
self._have_exc_type = exc_type is not None
diff --git a/Misc/NEWS.d/next/Library/2023-12-21-14-55-06.gh-issue-113358.nRkiSL.rst b/Misc/NEWS.d/next/Library/2023-12-21-14-55-06.gh-issue-113358.nRkiSL.rst
new file mode 100644
index 0000000..7641655
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-12-21-14-55-06.gh-issue-113358.nRkiSL.rst
@@ -0,0 +1 @@
+Fix rendering tracebacks with exceptions with a broken __getattr__