Merge branch 'main' into gh-82378-fix-tracebacklimit-in-pyrepl

python · pablogsal · Aug 18, 2024 · Jul 30, 2024 · Jul 31, 2024 · Jul 31, 2024
commit 01cb96a25a5aeaa6dc02525453b84499b7843570
diff --git a/Lib/code.py b/Lib/code.py
@@ -147,10 +147,10 @@ def showtraceback(self, **kwargs):
         sys.last_traceback = last_tb
         sys.last_exc = ei[1]
         try:
-            lines = traceback.format_exception(ei[0], ei[1], last_tb.tb_next, colorize=colorize,
-                                               limit=limit)
             if sys.excepthook is sys.__excepthook__:
-                lines = traceback.format_exception(ei[0], ei[1], last_tb.tb_next, colorize=colorize)
+                lines = traceback.format_exception(
+                    ei[0], ei[1], last_tb.tb_next, colorize=colorize,
+                    limit=limit)
                 self.write(''.join(lines))
             else:
                 # If someone has set sys.excepthook, we let that take precedence