Skip to content

Commit

Permalink
[3.11] pythongh-113358: Fix rendering tracebacks with exceptions with…
Browse files Browse the repository at this point in the history
… a broken __getattr__ (pythonGH-113359)

(cherry picked from commit 04fabe2)

Co-authored-by: Jérome Perrin <perrinjerome@gmail.com>
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
  • Loading branch information
perrinjerome and iritkatriel committed Jan 16, 2024
1 parent e5ae15f commit 616cd03
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
14 changes: 14 additions & 0 deletions Lib/test/test_traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,20 @@ def __repr__(self):
err_msg = '<note str() failed>'
self.assertEqual(self.get_report(e), vanilla + err_msg + '\nFinal Note\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):
Expand Down
6 changes: 5 additions & 1 deletion Lib/traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,11 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
# 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)}']

if exc_type and issubclass(exc_type, SyntaxError):
# Handle SyntaxError's specially
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix rendering tracebacks with exceptions with a broken __getattr__

0 comments on commit 616cd03

Please sign in to comment.