fix #591 changing stack trace linenos

thomasballinger · thomasballinger · commit 0cb8163adf8d · 2015-12-16T17:29:49.000-05:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -29,6 +29,7 @@
 import os
 import pkgutil
 import pydoc
+import re
 import shlex
 import subprocess
 import sys
@@ -133,6 +134,9 @@ def showsyntaxerror(self, filename=None):
                 # Stuff in the right filename and right lineno
                 if not py3:
                     lineno -= 1
+                if re.match(r'<bpython-input-\d+>', filename):
+                    filename = '<input>'
+                    # strip linecache line number
                 value = SyntaxError(msg, (filename, lineno, offset, line))
                 sys.last_value = value
         list = traceback.format_exception_only(type, value)
@@ -149,9 +153,14 @@ def showtraceback(self):
             sys.last_traceback = tb
             tblist = traceback.extract_tb(tb)
             del tblist[:1]
-            # Set the right lineno (encoding header adds an extra line)
-            if not py3:
-                for i, (fname, lineno, module, something) in enumerate(tblist):
+
+            for i, (fname, lineno, module, something) in enumerate(tblist):
+                # strip linecache line number
+                if re.match(r'<bpython-input-\d+>', fname):
+                    fname = '<input>'
+                    tblist[i] = (fname, lineno, module, something)
+                # Set the right lineno (encoding header adds an extra line)
+                if not py3:
                     if fname == '<input>':
                         tblist[i] = (fname, lineno - 1, module, something)
 
