diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index a6708119b81191..3e9af10b59e8d9 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -685,7 +685,6 @@ def f_with_multiline():
' ~~~~~~~~^^\n'
f' File "{__file__}", line {lineno_f+2}, in f_with_multiline\n'
' return compile(code, "?", "exec")\n'
- ' ~~~~~~~^^^^^^^^^^^^^^^^^^^\n'
' File "?", line 7\n'
' foo(a, z\n'
' ^'
@@ -775,8 +774,8 @@ def f_with_binary_operator():
def test_caret_for_binary_operators_with_spaces_and_parenthesis(self):
def f_with_binary_operator():
a = 1
- b = ""
- return ( a ) +b
+ b = c = ""
+ return ( a ) +b + c
lineno_f = f_with_binary_operator.__code__.co_firstlineno
expected_error = (
@@ -785,7 +784,7 @@ def f_with_binary_operator():
' callable()\n'
' ~~~~~~~~^^\n'
f' File "{__file__}", line {lineno_f+3}, in f_with_binary_operator\n'
- ' return ( a ) +b\n'
+ ' return ( a ) +b + c\n'
' ~~~~~~~~~~^~\n'
)
result_lines = self.get_exception(f_with_binary_operator)
@@ -973,7 +972,7 @@ def f1(a):
def f2(b):
raise RuntimeError("fail")
return f2
- return f1("x")("y")
+ return f1("x")("y")("z")
lineno_f = f_with_call.__code__.co_firstlineno
expected_error = (
@@ -982,7 +981,7 @@ def f2(b):
' callable()\n'
' ~~~~~~~~^^\n'
f' File "{__file__}", line {lineno_f+5}, in f_with_call\n'
- ' return f1("x")("y")\n'
+ ' return f1("x")("y")("z")\n'
' ~~~~~~~^^^^^\n'
f' File "{__file__}", line {lineno_f+3}, in f2\n'
' raise RuntimeError("fail")\n'
@@ -1497,6 +1496,184 @@ def f():
' raise MemoryError()']
self.assertEqual(actual, expected)
+ def test_anchors_for_simple_return_statements_are_elided(self):
+ def g():
+ 1/0
+
+ def f():
+ return g()
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " return g()",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g():
+ 1/0
+
+ def f():
+ return g() + 1
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " return g() + 1",
+ " ~^^",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g(*args):
+ 1/0
+
+ def f():
+ return g(1,
+ 2, 4,
+ 5)
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " return g(1,",
+ " 2, 4,",
+ " 5)",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g(*args):
+ 1/0
+
+ def f():
+ return g(1,
+ 2, 4,
+ 5) + 1
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " return g(1,",
+ " ~^^^",
+ " 2, 4,",
+ " ^^^^^",
+ " 5) + 1",
+ " ^^",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def test_anchors_for_simple_assign_statements_are_elided(self):
+ def g():
+ 1/0
+
+ def f():
+ x = g()
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " x = g()",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g(*args):
+ 1/0
+
+ def f():
+ x = g(1,
+ 2, 3,
+ 4)
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " x = g(1,",
+ " 2, 3,",
+ " 4)",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g():
+ 1/0
+
+ def f():
+ x = y = g()
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " x = y = g()",
+ " ~^^",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
+ def g(*args):
+ 1/0
+
+ def f():
+ x = y = g(1,
+ 2, 3,
+ 4)
+
+ result_lines = self.get_exception(f)
+ expected = ['Traceback (most recent call last):',
+ f" File \"{__file__}\", line {self.callable_line}, in get_exception",
+ " callable()",
+ " ~~~~~~~~^^",
+ f" File \"{__file__}\", line {f.__code__.co_firstlineno + 1}, in f",
+ " x = y = g(1,",
+ " ~^^^",
+ " 2, 3,",
+ " ^^^^^",
+ " 4)",
+ " ^^",
+ f" File \"{__file__}\", line {g.__code__.co_firstlineno + 1}, in g",
+ " 1/0",
+ " ~^~"
+ ]
+ self.assertEqual(result_lines, expected)
+
@requires_debug_ranges()
class PurePythonTracebackErrorCaretTests(
@@ -1691,7 +1868,7 @@ def f():
# Check a known (limited) number of recursive invocations
def g(count=10):
if count:
- return g(count-1)
+ return g(count-1) + 1
raise ValueError
with captured_output("stderr") as stderr_g:
@@ -1705,13 +1882,13 @@ def g(count=10):
lineno_g = g.__code__.co_firstlineno
result_g = (
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
' [Previous line repeated 7 more times]\n'
f' File "{__file__}", line {lineno_g+3}, in g\n'
@@ -1750,13 +1927,10 @@ def h(count=10):
' ~^^\n'
f' File "{__file__}", line {lineno_h+2}, in h\n'
' return h(count-1)\n'
- ' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_h+2}, in h\n'
' return h(count-1)\n'
- ' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_h+2}, in h\n'
' return h(count-1)\n'
- ' ~^^^^^^^^^\n'
' [Previous line repeated 7 more times]\n'
f' File "{__file__}", line {lineno_h+3}, in h\n'
' g()\n'
@@ -1776,13 +1950,13 @@ def h(count=10):
self.fail("no error raised")
result_g = (
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+3}, in g\n'
' raise ValueError\n'
@@ -1790,7 +1964,7 @@ def h(count=10):
)
tb_line = (
'Traceback (most recent call last):\n'
- f' File "{__file__}", line {lineno_g+80}, in _check_recursive_traceback_display\n'
+ f' File "{__file__}", line {lineno_g+77}, in _check_recursive_traceback_display\n'
' g(traceback._RECURSIVE_CUTOFF)\n'
' ~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
)
@@ -1808,13 +1982,13 @@ def h(count=10):
self.fail("no error raised")
result_g = (
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
f' File "{__file__}", line {lineno_g+2}, in g\n'
- ' return g(count-1)\n'
+ ' return g(count-1) + 1\n'
' ~^^^^^^^^^\n'
' [Previous line repeated 1 more time]\n'
f' File "{__file__}", line {lineno_g+3}, in g\n'
@@ -1823,7 +1997,7 @@ def h(count=10):
)
tb_line = (
'Traceback (most recent call last):\n'
- f' File "{__file__}", line {lineno_g+112}, in _check_recursive_traceback_display\n'
+ f' File "{__file__}", line {lineno_g+109}, in _check_recursive_traceback_display\n'
' g(traceback._RECURSIVE_CUTOFF + 1)\n'
' ~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
)
@@ -4260,11 +4434,14 @@ def foo(*args):
x = {'a':{'b': None}}
y = x['a']['b']['c']
- def baz(*args):
- return foo(1,2,3,4)
+ def baz2(*args):
+ return (lambda *args: foo(*args))(1,2,3,4)
+
+ def baz1(*args):
+ return baz2(1,2,3,4)
def bar():
- return baz(1,
+ return baz1(1,
2,3
,4)
try:
@@ -4278,10 +4455,10 @@ def bar():
boldr = traceback._ANSIColors.BOLD_RED
reset = traceback._ANSIColors.RESET
self.assertIn("y = " + red + "x['a']['b']" + reset + boldr + "['c']" + reset, lines)
- self.assertIn("return " + red + "foo" + reset + boldr + "(1,2,3,4)" + reset, lines)
- self.assertIn("return " + red + "baz" + reset + boldr + "(1," + reset, lines)
- self.assertIn(boldr + "2,3" + reset, lines)
- self.assertIn(boldr + ",4)" + reset, lines)
+ self.assertIn("return " + red + "(lambda *args: foo(*args))" + reset + boldr + "(1,2,3,4)" + reset, lines)
+ self.assertIn("return (lambda *args: " + red + "foo" + reset + boldr + "(*args)" + reset + ")(1,2,3,4)", lines)
+ self.assertIn("return baz2(1,2,3,4)", lines)
+ self.assertIn("return baz1(1,\n 2,3\n ,4)", lines)
self.assertIn(red + "bar" + reset + boldr + "()" + reset, lines)
def test_colorized_syntax_error(self):
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 1cf008c7e9da97..d3036a0653a83d 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -607,13 +607,10 @@ def format_frame_summary(self, frame_summary, **kwargs):
# attempt to parse for anchors
anchors = None
+ show_carets = False
with suppress(Exception):
anchors = _extract_caret_anchors_from_line_segment(segment)
-
- # only use carets if there are anchors or the carets do not span all lines
- show_carets = False
- if anchors or all_lines[0][:start_offset].lstrip() or all_lines[-1][end_offset:].rstrip():
- show_carets = True
+ show_carets = self.should_show_carets(start_offset, end_offset, all_lines, anchors)
result = []
@@ -727,6 +724,37 @@ def output_line(lineno):
return ''.join(row)
+ def should_show_carets(self, start_offset, end_offset, all_lines, anchors):
+ with suppress(SyntaxError, ImportError):
+ import ast
+ tree = ast.parse('\n'.join(all_lines))
+ statement = tree.body[0]
+ value = None
+ def _spawns_full_line(value):
+ return (
+ value.lineno == 1
+ and value.end_lineno == len(all_lines)
+ and value.col_offset == start_offset
+ and value.end_col_offset == end_offset
+ )
+ match statement:
+ case ast.Return(value=ast.Call()):
+ if isinstance(statement.value.func, ast.Name):
+ value = statement.value
+ case ast.Assign(value=ast.Call()):
+ if (
+ len(statement.targets) == 1 and
+ isinstance(statement.targets[0], ast.Name)
+ ):
+ value = statement.value
+ if value is not None and _spawns_full_line(value):
+ return False
+ if anchors:
+ return True
+ if all_lines[0][:start_offset].lstrip() or all_lines[-1][end_offset:].rstrip():
+ return True
+ return False
+
def format(self, **kwargs):
"""Format the stack ready for printing.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-12-03-18-21-59.gh-issue-99180.5m0V0q.rst b/Misc/NEWS.d/next/Core and Builtins/2023-12-03-18-21-59.gh-issue-99180.5m0V0q.rst
new file mode 100644
index 00000000000000..576626b702e75c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-12-03-18-21-59.gh-issue-99180.5m0V0q.rst
@@ -0,0 +1,2 @@
+Elide uninformative traceback indicators in ``return`` and simple
+``assignment`` statements. Patch by Pablo Galindo.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy