Merge branch 'fix-broken-history'

thomasballinger · thomasballinger · commit 7f7aee1d566b · 2015-12-22T10:42:21.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 -= 2
+                # strip linecache line number
+                if re.match(r'<bpython-input-\d+>', filename):
+                    filename = '<input>'
                 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 - 2, module, something)
 
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -2,7 +2,6 @@
 
 from __future__ import unicode_literals
 
-import linecache
 import sys
 
 from curtsies.fmtfuncs import bold, green, magenta, cyan, red, plain
@@ -14,12 +13,6 @@
 pypy = 'PyPy' in sys.version
 
 
-def _last_console_filename():
-    """Returns the last 'filename' used for console input
-    (as will be displayed in a traceback)."""
-    return '<bpython-input-%s>' % (len(linecache.cache.bpython_history) - 1)
-
-
 class TestInterpreter(unittest.TestCase):
     def test_syntaxerror(self):
         i = interpreter.Interp()
@@ -33,13 +26,13 @@ def append_to_a(message):
 
         if pypy:
             expected = (
-                '  File ' + green('"%s"' % _last_console_filename()) +
+                '  File ' + green('"<input>"') +
                 ', line ' + bold(magenta('1')) + '\n    1.1.1.1\n      ^\n' +
                 bold(red('SyntaxError')) + ': ' + cyan('invalid syntax') +
                 '\n')
         else:
             expected = (
-                '  File ' + green('"%s"' % _last_console_filename()) +
+                '  File ' + green('"<input>"') +
                 ', line ' + bold(magenta('1')) + '\n    1.1.1.1\n        ^\n' +
                 bold(red('SyntaxError')) + ': ' + cyan('invalid syntax') +
                 '\n')
@@ -62,7 +55,7 @@ def f():
         def g():
             return f()
 
-        i.runsource('g()', encode=False)
+        i.runsource('g()')
 
         if pypy:
             global_not_found = "global name 'g' is not defined"
@@ -71,7 +64,7 @@ def g():
 
         expected = (
             'Traceback (most recent call last):\n  File ' +
-            green('"%s"' % _last_console_filename()) + ', line ' +
+            green('"<input>"') + ', line ' +
             bold(magenta('1')) + ', in ' + cyan('<module>') + '\n    g()\n' +
             bold(red('NameError')) + ': ' + cyan(global_not_found) + '\n')
 
