add another method to make things less weird from an OO perspective

python · pablogsal · Aug 18, 2024 · Jul 30, 2024 · Jul 31, 2024 · Jul 31, 2024
commit e736e73cc9f300461478e9afa8c9e0af17fe7c64
@@ -161,11 +161,13 @@ def __init__(
         super().__init__(locals=locals, filename=filename, local_exit=local_exit)  # type: ignore[call-arg]
         self.can_colorize = _colorize.can_colorize()
 
-    def _showtraceback(se
8000
lf, typ, value, tb, colorize=False, limit=None):
+    def _excepthook(self, typ, value, tb):
         import traceback
-        return super()._showtraceback(
-            typ, value, tb, colorize=self.can_colorize,
-            limit=traceback.BUILTIN_EXCEPTION_LIMIT)
+        lines = traceback.format_exception(
+                typ, value, tb,
+                colorize=self.can_colorize,
+                limit=traceback.BUILTIN_EXCEPTION_LIMIT)
+        self.write(''.join(lines))
 
     def runsource(self, source, filename="<input>", symbol="single"):
         try:

diff --git a/Lib/code.py b/Lib/code.py
@@ -136,18 +136,12 @@ def showtraceback(self):
         finally:
             typ = value = tb = None
 
-    def _showtraceback(self, typ, value, tb, colorize=False, limit=None):
-        # This method is being overwritten in
-        # _pyrepl.console.InteractiveColoredConsole to pass different values of
-        # colorize and limit
+    def _showtraceback(self, typ, value, tb):
         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,
-                                                limit=limit)
-            self.write(''.join(lines))
+            self._excepthook(typ, value, tb)
         else:
             # If someone has set sys.excepthook, we let that take precedence
             # over self.write
@@ -164,6 +158,12 @@ def _showtraceback(self, typ, value, tb, colorize=False, limit=None):
                 print('Original exception was:', file=sys.stderr)
                 sys.__excepthook__(typ, value, tb)
 
+    def _excepthook(self, typ, value, tb):
+        # This method is being overwritten in
+        # _pyrepl.console.InteractiveColoredConsole
+        lines = traceback.format_exception(typ, value, tb)
+        self.write(''.join(lines))
+
     def write(self, data):
         """Write a string.
 

@@ -1020,7 +1020,7 @@ def test_dumb_terminal_exits_cleanly(self):
         env.update({"TERM": "dumb"})
         output, exit_code = self.run_repl("exit()\n", env=env)
         self.assertEqual(exit_code, 0)
-        self.assertIn("warning: can\'t use pyrepl", output)
+        self.assertIn("warning: can't use pyrepl", output)
         self.assertNotIn("Exception", output)
         self.assertNotIn("Traceback", output)