fix 415

thomasballinger · thomasballinger · commit 3cddcc61fce7 · 2014-10-17T19:57:32.000-04:00
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -36,16 +36,16 @@ class BPythonFormatter(Formatter):
     them into the appropriate format string
     as defined above, then writes to the outfile
     object the final formatted string. This does not write real strings. It writes format string (FmtStr) objects.
- 
+
     See the Pygments source for more info; it's pretty
     straightforward."""
- 
+
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
         for k, v in color_scheme.iteritems():
             self.f_strings[k] = '\x01%s' % (v,)
         Formatter.__init__(self, **options)
- 
+
     def format(self, tokensource, outfile):
         o = ''
 
@@ -54,7 +54,7 @@ def format(self, tokensource, outfile):
                 token = token.parent
             o += "%s\x03%s\x04" % (self.f_strings[token], text)
         outfile.write(parse(o.rstrip()))
- 
+
 class Interp(code.InteractiveInterpreter):
     def __init__(self, locals=None):
         """Constructor.
@@ -128,7 +128,6 @@ def showtraceback(self):
         lexer = get_lexer_by_name("pytb", stripall=True)
 
         self.format(tbtext,lexer)
-        
 
     def format(self, tbtext, lexer):
         traceback_informative_formatter = BPythonFormatter(default_colors)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -667,7 +667,7 @@ def process_simple_keypress(self, e):
             self.add_normal_character(e)
 
     def send_current_block_to_external_editor(self, filename=None):
-        text = self.send_to_external_editor(self.get_current_block().encode('utf8'))
+        text = self.send_to_external_editor(self.get_current_block())
         lines = [line for line in text.split('\n')]
         while lines and not lines[-1].split():
             lines.pop()
@@ -679,11 +679,11 @@ def send_current_block_to_external_editor(self, filename=None):
         self.cursor_offset = len(self.current_line)
 
     def send_session_to_external_editor(self, filename=None):
-        for_editor = '### current bpython session - file will be reevaluated, ### lines will not be run\n'.encode('utf8')
-        for_editor += ('\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
-                                 (line[len(self.ps2):] if line.startswith(self.ps2) else
-                                 '### '+line)
-                                 for line in self.getstdout().split('\n')).encode('utf8'))
+        for_editor = u'### current bpython session - file will be reevaluated, ### lines will not be run\n'
+        for_editor += '\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
+                                (line[len(self.ps2):] if line.startswith(self.ps2) else
+                                '### '+line)
+                                for line in self.getstdout().split('\n'))
         text = self.send_to_external_editor(for_editor)
         lines = text.split('\n')
         self.history = [line for line in lines if line[:4] != '### ']
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1046,11 +1046,14 @@ def send_to_external_editor(self, text, filename=None):
         """Returns modified text from an editor, or the oriignal text if editor exited with non-zero"""
         editor_args = shlex.split(self.config.editor)
         with tempfile.NamedTemporaryFile(suffix='.py') as temp:
-            temp.write(text)
+            temp.write(text.encode(getpreferredencoding()))
             temp.flush()
             if subprocess.call(editor_args + [temp.name]) == 0:
                 with open(temp.name) as f:
-                    return f.read()
+                    if py3:
+                        return f.read()
+                    else:
+                        return f.read().decode(getpreferredencoding())
             else:
                 return text
 
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -53,8 +53,9 @@ def test_external_communication(self):
         self.repl.send_session_to_external_editor()
 
     def test_external_communication_encoding(self):
-        self.repl.display_lines.append(u'>>> åß∂ƒ')
-        self.repl.send_session_to_external_editor()
+        with captured_output():
+            self.repl.display_lines.append(u'>>> "åß∂ƒ"')
+            self.repl.send_session_to_external_editor()
 
     def test_get_last_word(self):
         self.repl.rl_history.entries=['1','2 3','4 5 6']
