Issue #23631: Fix traceback.format_list when a traceback has been mutated.
This commit is contained in:
parent
93f4d4c1d6
commit
bbb8ade904
|
@ -555,6 +555,14 @@ class TestStack(unittest.TestCase):
|
|||
[' File "foo.py", line 1, in fred\n line\n'],
|
||||
s.format())
|
||||
|
||||
def test_from_list_edited_stack(self):
|
||||
s = traceback.StackSummary.from_list([('foo.py', 1, 'fred', 'line')])
|
||||
s[0] = ('foo.py', 2, 'fred', 'line')
|
||||
s2 = traceback.StackSummary.from_list(s)
|
||||
self.assertEqual(
|
||||
[' File "foo.py", line 2, in fred\n line\n'],
|
||||
s2.format())
|
||||
|
||||
def test_format_smoke(self):
|
||||
# For detailed tests see the format_list tests, which consume the same
|
||||
# code.
|
||||
|
@ -585,7 +593,7 @@ class TestStack(unittest.TestCase):
|
|||
traceback.walk_stack(None), capture_locals=True, limit=1)
|
||||
s = some_inner(3, 4)
|
||||
self.assertEqual(
|
||||
[' File "' + __file__ + '", line 585, '
|
||||
[' File "' + __file__ + '", line 593, '
|
||||
'in some_inner\n'
|
||||
' traceback.walk_stack(None), capture_locals=True, limit=1)\n'
|
||||
' a = 1\n'
|
||||
|
|
|
@ -348,11 +348,17 @@ class StackSummary(list):
|
|||
This method supports the older Python API. Each tuple should be a
|
||||
4-tuple with (filename, lineno, name, line) elements.
|
||||
"""
|
||||
if isinstance(a_list, StackSummary):
|
||||
return StackSummary(a_list)
|
||||
# While doing a fast-path check for isinstance(a_list, StackSummary) is
|
||||
# appealing, idlelib.run.cleanup_traceback and other similar code may
|
||||
# break this by making arbitrary frames plain tuples, so we need to
|
||||
# check on a frame by frame basis.
|
||||
result = StackSummary()
|
||||
for filename, lineno, name, line in a_list:
|
||||
result.append(FrameSummary(filename, lineno, name, line=line))
|
||||
for frame in a_list:
|
||||
if isinstance(frame, FrameSummary):
|
||||
result.append(frame)
|
||||
else:
|
||||
filename, lineno, name, line = frame
|
||||
result.append(FrameSummary(filename, lineno, name, line=line))
|
||||
return result
|
||||
|
||||
def format(self):
|
||||
|
|
Loading…
Reference in New Issue