Use Curtsies interpreter for -i file

thomasballinger · thomasballinger · commit 455932864ab2 · 2015-12-23T10:48:42.000-08:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -13,6 +13,7 @@
 
 from bpython.curtsiesfrontend.repl import BaseRepl
 from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet
+from bpython.curtsiesfrontend.interpreter import Interp
 from bpython import args as bpargs
 from bpython import translations
 from bpython.translations import _
@@ -165,7 +166,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
             paste.events.extend(sourcecode)
         else:
             try:
-                interp = code.InteractiveInterpreter(locals=locals_)
+                interp = Interp(locals=locals_)
                 bpargs.exec_code(interp, exec_args)
             except SystemExit as e:
                 exit_value = e.args
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -1,6 +1,6 @@
 import sys
 from codeop import CommandCompiler
-from six import iteritems
+from six import iteritems, text_type
 
 from pygments.token import Generic, Token, Keyword, Name, Comment, String
 from pygments.token import Error, Literal, Number, Operator, Punctuation
@@ -83,7 +83,14 @@ def __init__(self, locals=None, encoding=None):
         self.compile = CommandCompiler()
 
         # typically changed after being instantiated
-        self.write = lambda stuff: sys.stderr.write(stuff)
+        # but used when interpreter used corresponding REPL
+        def write(err_line):
+            """Default stderr handler for tracebacks
+
+            Accepts FmtStrs so interpreters can output them"""
+            sys.stderr.write(text_type(err_line))
+
+        self.write = write
         self.outfile = self
 
     def writetb(self, lines):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1119,6 +1119,7 @@ def get_current_block(self):
         return '\n'.join(self.buffer + [self.current_line])
 
     def send_to_stdout(self, output):
+        """Send unicode string to Repl stdout"""
         lines = output.split('\n')
         logger.debug('display_lines: %r', self.display_lines)
         self.current_stdouterr_line += lines[0]
@@ -1133,6 +1134,10 @@ def send_to_stdout(self, output):
         logger.debug('display_lines: %r', self.display_lines)
 
     def send_to_stderr(self, error):
+        """Send unicode strings or FmtStr to Repl stderr
+
+        Must be able to handle FmtStrs because interepter pass in
+        tracebacks already formatted."""
         lines = error.split('\n')
         if lines[-1]:
             self.current_stdouterr_line += lines[-1]
