Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-82378: fix sys.tracebacklimit in pyrepl #122452

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Lib/_pyrepl/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,12 @@ def __init__(
self.can_colorize = _colorize.can_colorize()

def showsyntaxerror(self, filename=None):
super().showsyntaxerror(colorize=self.can_colorize)
import traceback
super().showsyntaxerror(colorize=self.can_colorize, limit=traceback.BUILTIN_EXCEPTION_LIMIT)

def showtraceback(self):
super().showtraceback(colorize=self.can_colorize)
import traceback
super().showtraceback(colorize=self.can_colorize, limit=traceback.BUILTIN_EXCEPTION_LIMIT)

def runsource(self, source, filename="<input>", symbol="single"):
try:
Expand Down
11 changes: 7 additions & 4 deletions Lib/code.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def showsyntaxerror(self, filename=None, **kwargs):

"""
colorize = kwargs.pop('colorize', False)
limit = kwargs.pop('limit', None)
try:
typ, value, tb = sys.exc_info()
if filename and typ is SyntaxError:
Expand All @@ -119,7 +120,7 @@ def showsyntaxerror(self, filename=None, **kwargs):
else:
# Stuff in the right filename
value = SyntaxError(msg, (filename, lineno, offset, line))
self._showtraceback(typ, value, None, colorize)
self._showtraceback(typ, value, None, colorize, limit)
finally:
typ = value = tb = None

Expand All @@ -132,19 +133,21 @@ def showtraceback(self, **kwargs):

"""
colorize = kwargs.pop('colorize', False)
limit = kwargs.pop('limit', None)
try:
typ, value, tb = sys.exc_info()
self._showtraceback(typ, value, tb.tb_next, colorize)
self._showtraceback(typ, value, tb.tb_next, colorize, limit)
finally:
typ = value = tb = None

def _showtraceback(self, typ, value, tb, colorize):
def _showtraceback(self, typ, value, tb, colorize, limit):
sys.last_type = typ
sys.last_traceback = tb
sys.last_exc = sys.last_value = value = value.with_traceback(tb)
if sys.excepthook is sys.__excepthook__:
lines = traceback.format_exception(typ, value, tb,
colorize=colorize)
colorize=colorize,
limit=limit)
self.write(''.join(lines))
else:
# If someone has set sys.excepthook, we let that take precedence
Expand Down
25 changes: 25 additions & 0 deletions Lib/test/test_pyrepl/test_pyrepl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,31 @@ def test_not_wiping_history_file(self):
self.assertIn("spam", output)
self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size, 0)

@force_not_colorized
def test_proper_tracebacklimit(self):
env = os.environ.copy()
commands = ("import sys\n"
"sys.tracebacklimit = 1\n"
"def x1(): 1/0\n\n"
"def x2(): x1()\n\n"
"def x3(): x2()\n\n"
"x3()\n"
"exit()\n")

env.pop("PYTHON_BASIC_REPL", None)
output, exit_code = self.run_repl(commands, env=env)
if "can\'t use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertIn("in x1", output)
self.assertNotIn("in x3", output)
self.assertNotIn("in <module>", output)

env["PYTHON_BASIC_REPL"] = "1"
output, exit_code = self.run_repl(commands, env=env)
self.assertIn("in x1", output)
self.assertNotIn("in x3", output)
self.assertNotIn("in <module>", output)

def run_repl(
self,
repl_input: str | list[str],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Make sure that the new :term:`REPL` interprets :data:`sys.tracebacklimit` in
the same way that the classic REPL did.
Loading