Incorporate new interpreter class into the main repl and use our write traceback method to send to standard error.

thomasballinger · mlauter · commit b5dac4d9888f · 2014-08-29T15:36:43.000-04:00
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -29,7 +29,6 @@
         Name.Class:'d',
     }
  
- 
 class BPythonFormatter(Formatter):
     """This is subclassed from the custom formatter for bpython.
     Its format() method receives the tokensource
@@ -58,7 +57,7 @@ def format(self, tokensource, outfile):
         outfile.write(str(parse(o.rstrip())))
  
 class Interp(code.InteractiveInterpreter):
-    def __init__(self, locals=None, outfile=sys.__stderr__):
+    def __init__(self, locals=None):
         """Constructor.
 
         The optional 'locals' argument specifies the dictionary in
@@ -73,7 +72,10 @@ def __init__(self, locals=None, outfile=sys.__stderr__):
             locals = {"__name__": "__console__", "__doc__": None}
         self.locals = locals
         self.compile = CommandCompiler()
-        self.outfile = outfile
+
+        # typically changed after being instantiated
+        self.write = lambda stuff: sys.stderr.write(stuff)
+        self.outfile = self
 
     def showsyntaxerror(self, filename=None):
         """Display the syntax error that just occurred.
@@ -113,10 +115,10 @@ def showsyntaxerror(self, filename=None):
             if text.endswith('\n'):
                 cur_line.append((token,text))
                 if no_format_mode:
-                    traceback_code_formatter.format(cur_line,self.outfile)
+                    traceback_code_formatter.format(cur_line, self.outfile)
                     no_format_mode = False
                 else:
-                    traceback_informative_formatter.format(cur_line,self.outfile)
+                    traceback_informative_formatter.format(cur_line, self.outfile)
                 cur_line = []
             elif text == '    ' and cur_line == []:
                 no_format_mode = True
@@ -154,10 +156,10 @@ def showtraceback(self):
             if text.endswith('\n'):
                 cur_line.append((token,text))
                 if no_format_mode:
-                    traceback_code_formatter.format(cur_line,self.outfile)
+                    traceback_code_formatter.format(cur_line, self.outfile)
                     no_format_mode = False
                 else:
-                    traceback_informative_formatter.format(cur_line,self.outfile)
+                    traceback_informative_formatter.format(cur_line, self.outfile)
                 cur_line = []
             elif text == '    ' and cur_line == []:
                 no_format_mode = True
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -239,6 +239,7 @@ def __init__(self,
                                                    # state was passed in
         if interp is None:
             interp = Interp(locals=locals_)
+            interp.writetb = self.send_to_stderr
         if banner is None:
             banner = _('Welcome to bpython! Press <%s> for help.') % config.help_key
         config.autocomplete_mode = autocomplete.SIMPLE # only one implemented currently
@@ -1107,6 +1108,7 @@ def reevaluate(self, insert_into_history=False):
 
         if not self.weak_rewind:
             self.interp = self.interp.__class__()
+            self.interp.writetb = self.send_to_stderr
             self.coderunner.interp = self.interp
 
         self.buffer = []
