Merge branch 'edit-config'

thomasballinger · thomasballinger · commit f8ccef31e042 · 2014-08-29T08:37:24.000-07:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -69,6 +69,7 @@ def loadini(struct, configfile):
             'down_one_line': 'C-n',
             'exit': '',
             'external_editor': 'F7',
+            'edit_config': 'F3',
             'edit_current_block': 'C-x',
             'help': 'F1',
             'last_output': 'F9',
@@ -99,6 +100,8 @@ def loadini(struct, configfile):
                              "%s\n" % default_config_path())
             sys.exit(1)
 
+    struct.config_path = config_path
+
     struct.dedent_after = config.getint('general', 'dedent_after')
     struct.tab_length = config.getint('general', 'tab_length')
     struct.auto_display_list = config.getboolean('general',
@@ -131,6 +134,7 @@ def loadini(struct, configfile):
     struct.delete_key = config.get('keyboard', 'delete')
     struct.exit_key = config.get('keyboard', 'exit')
     struct.last_output_key = config.get('keyboard', 'last_output')
+    struct.edit_config_key = config.get('keyboard', 'edit_config')
     struct.edit_current_block_key = config.get('keyboard', 'edit_current_block')
     struct.external_editor_key = config.get('keyboard', 'external_editor')
     struct.help_key = config.get('keyboard', 'help')
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -497,6 +497,8 @@ def process_key_event(self, e):
             greenlet.greenlet(self.pastebin).switch()
         elif e in key_dispatch[self.config.external_editor_key]:
             self.send_session_to_external_editor()
+        elif e in key_dispatch[self.config.edit_config_key]:
+            greenlet.greenlet(self.edit_config).switch()
         #TODO add PAD keys hack as in bpython.cli
         elif e in key_dispatch[self.config.edit_current_block_key]:
             self.send_current_block_to_external_editor()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1022,6 +1022,36 @@ def send_to_external_editor(self, text, filename=None):
             else:
                 return text
 
+    def open_in_external_editor(self, filename):
+        editor_args = shlex.split(self.config.editor)
+        if subprocess.call(editor_args + [filename]) == 0:
+            return True
+        return False
+
+    def edit_config(self):
+        if not (os.path.isfile(self.config.config_path)):
+            if self.interact.confirm(_("Config file does not exist - create new from default? (y/N)")):
+                try:
+                    bpython_dir, script_name = os.path.split(__file__)
+                    with open(os.path.join(bpython_dir, "sample-config")) as f:
+                        default_config = f.read()
+
+                    containing_dir = os.path.dirname(os.path.abspath(self.config.config_path))
+                    if not os.path.exists(containing_dir):
+                        os.makedirs(containing_dir)
+                    with open(self.config.config_path, 'w') as f:
+                        f.write(default_config)
+                except (IOError, OSError) as e:
+                    self.interact.notify('error creating file: %r' % e)
+                    return False
+            else:
+                return False
+
+        if self.open_in_external_editor(self.config.config_path):
+            self.interact.notify('bpython config file edited. Restart bpython for changes to take effect.')
+        else:
+            self.interact.notify('error editing config file')
+
 
 def next_indentation(line, tab_length):
     """Given a code line, return the indentation of the next line."""
diff --git a/bpython/sample-config b/bpython/sample-config
@@ -3,6 +3,9 @@
 # By default bpython will look for $XDG_CONFIG_HOME/bpython/config
 # ($XDG_CONFIG_HOME defaults to ~/.config) or you can specify a file with the
 # --config option on the command line
+#
+# see http://docs.bpython-interpreter.org/configuration.html
+# for all configurable options
 
 # General section tag
 [general]
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -159,7 +159,7 @@ Valid keys are:
 
 pastebin
 ^^^^^^^^
-Default: <F8>
+Default: F8
 
 last_output
 ^^^^^^^^^^^
diff --git a/setup.py b/setup.py
@@ -184,7 +184,7 @@ def initialize_options(self):
     packages = packages,
     data_files = data_files,
     package_data = {
-        'bpython': ['logo.png'],
+        'bpython': ['logo.png', 'sample-config'],
         'bpython.translations': mo_files,
         'bpython.test': ['test.config', 'test.theme']
     },
