Make sample config used as template for new config file

thomasballinger · thomasballinger · commit 46bc5125a4cf · 2014-08-27T14:23:07.000-07:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1029,25 +1029,20 @@ def open_in_external_editor(self, filename):
         return False
 
     def edit_config(self):
-        #TODO put default-config somewhere accessible to this code
-        DEFAULT = ("[general]\n"
-                   "syntax = True\n"
-                   "[keyboard]\n"
-                   "pastebin = F8\n"
-                   "save = C-s\n")
-
-        open('a.txt', 'w').write(repr(self.config.config_path))
         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)
+                        f.write(default_config)
                 except (IOError, OSError) as e:
                     self.interact.notify('error creating file: %r' % e)
-                    raise e
                     return False
             else:
                 return False
diff --git a/bpython/sample-config b/bpython/sample-config
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']
     },
