fixes for external editor functionality

thomasballinger · thomasballinger · commit dd1373fc5316 · 2014-03-04T12:22:33.000-05:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1523,7 +1523,7 @@ def yank_from_buffer(self):
         self.print_line(self.s, clr=True)
 
     def send_current_line_to_editor(self):
-        lines = repl.send_to_external_editor(self.s).split('\n')
+        lines = self.send_to_external_editor(self.s).split('\n')
         self.s = ''
         self.print_line(self.s)
         while lines and not lines[-1]:
diff --git a/bpython/config.py b/bpython/config.py
@@ -72,7 +72,8 @@ def loadini(struct, configfile):
             'pastebin_private': True,
             'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
             'pastebin_helper': '',
-            'save_append_py': False
+            'save_append_py': False,
+            'editor': 'vi',
         },
         'keyboard': {
             'clear_line': 'C-u',
@@ -121,6 +122,7 @@ def loadini(struct, configfile):
     struct.highlight_show_source = config.getboolean('general',
                                                      'highlight_show_source')
     struct.hist_file = config.get('general', 'hist_file')
+    struct.editor = config.get('general', 'editor')
     struct.hist_length = config.getint('general', 'hist_length')
     struct.hist_duplicates = config.getboolean('general', 'hist_duplicates')
     struct.flush_output = config.getboolean('general', 'flush_output')
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -338,7 +338,7 @@ def process_event(self, e):
             g = greenlet.greenlet(self.pastebin)
             g.switch()
         elif e in key_dispatch[self.config.external_editor_key]:
-            self.send_to_external_editor()
+            self.send_session_to_external_editor()
         #TODO add PAD keys hack as in bpython.cli
         elif e in ["\x18"]:
             self.send_current_block_to_external_editor()
@@ -861,19 +861,13 @@ def getstdout(self):
         s = '\n'.join([x.s if isinstance(x, FmtStr) else x for x in lines]
                      ) if lines else ''
         return s
-    def send_to_external_editor(self, filename=None):
-        editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim'))
-        editor_args = editor.split()
-        text = self.getstdout()
-        with tempfile.NamedTemporaryFile(suffix='.py') as temp:
-            temp.write('### current bpython session - file will be reevaluated, ### lines will not be run\n'.encode('utf8'))
-            temp.write('\n'.join(line[4:] if line[:4] in ('... ', '>>> ') else '### '+line
-                                 for line in text.split('\n')).encode('utf8'))
-            temp.flush()
-            subprocess.call(editor_args + [temp.name])
-            lines = open(temp.name).read().split('\n')
-            self.history = [line for line in lines
-                                 if line[:4] != '### ']
+    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[4:] if line[:4] in ('... ', '>>> ') else '### '+line
+                       for line in self.getstdout().split('\n')).encode('utf8'))
+        text = self.send_to_external_editor(for_editor)
+        lines = open(text).split('\n')
+        self.history = [line for line in lines if line[:4] != '### ']
         self.reevaluate(insert_into_history=True)
         self._current_line = lines[-1][4:]
         self.cursor_offset_in_line = len(self._current_line)
@@ -892,18 +886,12 @@ def clear_current_block(self):
         self.done = True
 
     def send_current_block_to_external_editor(self, filename=None):
-        editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim'))
-        editor_args = editor.split()
-        text = self.get_current_block()
+        text = self.send_to_external_editor(self.get_current_block())
+        lines = [line for line in text.split('\n')]
+        while not lines[-1].split():
+            lines.pop()
+        events = '\n'.join(lines + ([''] if len(lines) == 1 else ['', '']))
         self.clear_current_block()
-        with tempfile.NamedTemporaryFile(suffix='.py') as temp:
-            temp.write(text.encode('utf8'))
-            temp.flush()
-            subprocess.call(editor_args + [temp.name])
-            lines = [line for line in open(temp.name).read().split('\n')]
-            while not lines[-1].split():
-                lines.pop()
-            events = '\n'.join(lines + ([''] if len(lines) == 1 else ['', '']))
         self.paste_mode = True
         for e in events:
             self.process_simple_event(e)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -28,6 +28,7 @@
 import inspect
 import os
 import pydoc
+import shlex
 import subprocess
 import sys
 import tempfile
@@ -993,6 +994,17 @@ def clear_current_line(self):
         """This is used as the exception callback for the Interpreter instance.
         It prevents autoindentation from occuring after a traceback."""
 
+    def send_to_external_editor(self, text, filename=None):
+        editor = (self.config.editor or
+                  os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim')))
+        editor_args = shlex.split(editor)
+        with tempfile.NamedTemporaryFile(suffix='.py') as temp:
+            temp.write(text)
+            temp.flush()
+            if subprocess.call(editor_args + [temp.name]) == 0:
+                with open(temp.name) as f:
+                    return f.read()
+
 
 def next_indentation(line, tab_length):
     """Given a code line, return the indentation of the next line."""
@@ -1066,11 +1078,3 @@ def extract_exit_value(args):
     else:
         return args
 
-def send_to_external_editor(text, filename=None):
-    editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim'))
-    editor_args = editor.split()
-    with tempfile.NamedTemporaryFile(suffix='.py') as temp:
-        temp.write(text)
-        temp.flush()
-        subprocess.call(editor_args + [temp.name])
-        return open(temp.name).read()
diff --git a/sample-config b/sample-config
@@ -32,6 +32,9 @@ tab_length = 4
 # to "default" to use the default theme
 color_scheme = default
 
+# External editor to use for editing the current line, block, or full history
+editor = vi
+
 [keyboard]
 pastebin = F8
 save = C-s
