editor fixes

thomasballinger · thomasballinger · commit 5d713fa0bdd6 · 2014-03-04T16:46:24.000-05:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -73,7 +73,7 @@ def loadini(struct, configfile):
             'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
             'pastebin_helper': '',
             'save_append_py': False,
-            'editor': 'vi',
+            'editor': os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
         },
         'keyboard': {
             'clear_line': 'C-u',
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -866,7 +866,7 @@ def send_session_to_external_editor(self, filename=None):
         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')
+        lines = 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:]
@@ -888,7 +888,7 @@ def clear_current_block(self):
     def send_current_block_to_external_editor(self, filename=None):
         text = self.send_to_external_editor(self.get_current_block())
         lines = [line for line in text.split('\n')]
-        while not lines[-1].split():
+        while lines and not lines[-1].split():
             lines.pop()
         events = '\n'.join(lines + ([''] if len(lines) == 1 else ['', '']))
         self.clear_current_block()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -996,9 +996,7 @@ 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 = (self.config.editor or
-                  os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim')))
-        editor_args = shlex.split(editor)
+        editor_args = shlex.split(self.config.editor)
         with tempfile.NamedTemporaryFile(suffix='.py') as temp:
             temp.write(text)
             temp.flush()
