Encode arguments to shlex in Python < 2.7.3

sebastinas · sebastinas · commit a3f43bad2616 · 2015-02-07T01:47:21.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -42,3 +42,10 @@
     from pygments.lexers import Python3Lexer as PythonLexer
 else:
     from pygments.lexers import PythonLexer
+
+if py3 or sys.version_info[:3] >= (2, 7, 3):
+    def prepare_for_exec(arg, encoding=None):
+        return arg
+else:
+    def prepare_for_exec(arg, encoding=None):
+        return arg.encode(encoding)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -45,7 +45,7 @@
 from pygments.token import Token
 
 from bpython import inspection
-from bpython._py3compat import PythonLexer, py3
+from bpython._py3compat import PythonLexer, py3, prepare_for_exec
 from bpython.formatter import Parenthesis
 from bpython.translations import _, ngettext
 from bpython.clipboard import get_clipboard, CopyFailed
@@ -1029,22 +1029,30 @@ def clear_current_line(self):
     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)
+
+        encoding = getpreferredencoding()
+        editor_args = shlex.split(prepare_for_exec(self.config.editor,
+                                                   encoding))
         with tempfile.NamedTemporaryFile(suffix='.py') as temp:
-            temp.write(text.encode(getpreferredencoding()))
+            temp.write(text.encode(encoding))
             temp.flush()
-            if subprocess.call(editor_args + [temp.name]) == 0:
+
+            args = editor_args + [prepare_for_exec(temp.name, encoding)]
+            if subprocess.call(args) == 0:
                 with open(temp.name) as f:
                     if py3:
                         return f.read()
                     else:
-                        return f.read().decode(getpreferredencoding())
+                        return f.read().decode(encoding)
             else:
                 return text
 
     def open_in_external_editor(self, filename):
-        editor_args = shlex.split(self.config.editor)
-        if subprocess.call(editor_args + [filename]) == 0:
+        encoding = getpreferredencoding()
+        editor_args = shlex.split(prepare_for_exec(self.config.editor,
+                                                   encoding))
+        args = editor_args + [prepare_for_exec(filename, encoding)]
+        if subprocess.call(args) == 0:
             return True
         return False
 
