Improve handling of SyntaxErrors

sebastinas · sebastinas · commit 937626dd46ab · 2022-05-04T01:25:42.000+02:00
&lt;bpython-line-%&gt; is now detected and replaced with &lt;input&gt; in more cases.
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -166,20 +166,13 @@ def showsyntaxerror(self, filename: Optional[str] = None) -> None:
         exc_type, value, sys.last_traceback = sys.exc_info()
         sys.last_type = exc_type
         sys.last_value = value
-        if (
-            filename
-            and exc_type is SyntaxError
-            and value is not None
-            and len(value.args) >= 4
-        ):
-            msg = str(value)
-            lineno = value.args[1]
-            offset = value.args[2]
-            line = value.args[3]
+        if filename and exc_type is SyntaxError and value is not None:
+            msg = value.args[0]
+            args = list(value.args[1])
             # strip linechache line number
             if self.bpython_input_re.match(filename):
-                filename = "<input>"
-            value = SyntaxError(msg, (filename, lineno, offset, line))
+                args[0] = "<input>"
+            value = SyntaxError(msg, tuple(args))
             sys.last_value = value
         exc_formatted = traceback.format_exception_only(exc_type, value)
         self.writetb(exc_formatted)
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -38,7 +38,7 @@ def test_syntaxerror(self):
         if (3, 10, 1) <= sys.version_info[:3]:
             expected = (
                 "  File "
-                + green('"<bpython-input-147>"')
+                + green('"<input>"')
                 + ", line "
                 + bold(magenta("1"))
                 + "\n    1.1.1.1\n       ^^\n"
@@ -50,7 +50,7 @@ def test_syntaxerror(self):
         elif (3, 10) <= sys.version_info[:2]:
             expected = (
                 "  File "
-                + green('"<bpython-input-147>"')
+                + green('"<input>"')
                 + ", line "
                 + bold(magenta("1"))
                 + "\n    1.1.1.1\n    ^^^^^\n"
