make bpython now use ~/.bpython/config instead of ~/.bpython.ini (but still

bobf · bobf · commit f39df5321edd · 2009-06-25T11:44:34.000+01:00
fall back, for now, to ~/.bpython.ini if ~/.bpython/config doesn't exist)
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1969,7 +1969,7 @@ def init_wins(scr, cols):
 
 # TODO:
 # 
-# This should show to be configured keys from bpython.ini
+# This should show to be configured keys from ~/.bpython/config
 # 
     statusbar = Statusbar(scr, main_win,
         ".:: <C-d> Exit  <C-r> Rewind  <%s> Save  <%s> Pastebin ::." % (OPTS.save_key, OPTS.pastebin_key),
@@ -2130,7 +2130,7 @@ def main(args=None):
                                 'NOTE: If bpython sees an argument it does '
                                  'not know, execution falls back to the '
                                  'regular Python interpreter.')
-    parser.add_option('--config', '-c', default='~/.bpython.ini',
+    parser.add_option('--config', '-c', default='~/.bpython/config',
                       help='use CONFIG instead of default config file')
     parser.add_option('--interactive', '-i', action='store_true',
                       help='Drop to bpython shell after running file '
diff --git a/bpython/config.py b/bpython/config.py
@@ -3,6 +3,7 @@
 from ConfigParser import ConfigParser, NoSectionError, NoOptionError
 from itertools import chain
 from bpython.keys import key_dispatch
+import errno
 
 class Struct(object):
     """Simple class for instantiating objects we can add arbitrary attributes
@@ -13,6 +14,9 @@ class Struct(object):
 class CP(ConfigParser):
     def safeget(self, section, option, default):
         """safet get method using default values"""
+        bools_t = ['true', 'yes', 'y', 'on']
+        bools_f = ['false', 'no', 'n', 'off']
+
         try:
             v = self.get(section, option)
         except NoSectionError:
@@ -21,6 +25,13 @@ def safeget(self, section, option, default):
             v = default
         if isinstance(v, bool):
             return v
+        try:
+            if v.lower() in bools_t:
+                return True
+            if v.lower() in bools_f:
+                return False
+        except AttributeError:
+            pass
         try:
             return int(v)
         except ValueError:
@@ -30,10 +41,15 @@ def safeget(self, section, option, default):
 def loadini(struct, configfile):
     """Loads .ini configuration file and stores its values in struct"""
 
-    configfile = os.path.expanduser(configfile)
+    config_path = os.path.expanduser(configfile)
+    if not os.path.isfile(config_path) and configfile == '~/.bpython/config':
+        # FIXME: I decided ~/.bpython.ini was a crappy place for a config file,
+        # so this is just a fallback if the default is passed - remove this
+        # eventually please.
+        config_path = os.path.expanduser('~/.bpython.ini')
 
     config = CP()
-    config.read(configfile)
+    config.read(config_path)
 
     struct.tab_length = config.safeget('general', 'tab_length', 4)
     struct.auto_display_list = config.safeget('general', 'auto_display_list',
@@ -66,7 +82,7 @@ def loadini(struct, configfile):
         }
     else:
         path = os.path.expanduser('~/.bpython/%s.theme' % (color_scheme_name,))
-        load_theme(struct, path, configfile)
+        load_theme(struct, path, config_path)
 
 
     # checks for valid key configuration this part still sucks
@@ -130,12 +146,19 @@ def migrate_rc(path):
                     v = bools[v.lower()]
                 config.set('general', k, v)
     f.close()
-    f = open(os.path.expanduser('~/.bpython.ini'), 'w')
+    try:
+        os.makedirs(os.path.expanduser('~/.bpython'))
+    except OSError, e:
+        if e.errno == errno.EEXIST:
+            pass
+        else:
+            raise
+    f = open(os.path.expanduser('~/.bpython/config'), 'w')
     config.write(f)
     f.close()
     os.rename(path, os.path.expanduser('~/.bpythonrc.bak'))
     print ("The configuration file for bpython has been changed. A new "
-           ".bpython.ini file has been created in your home directory.")
+           "config file has been created as ~/.bpython/config")
     print ("The existing .bpythonrc file has been renamed to .bpythonrc.bak "
            "and it can be removed.")
     print "Press enter to continue."
diff --git a/doc/bpython-config.5 b/doc/bpython-config.5
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH BPYTHON.INI 5 "August 13, 2008"
+.TH BPYTHON-CONFIG 5 "August 13, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,12 +16,12 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-bpython.ini \- user configuration file for bpython
+config \- user configuration file for bpython
 .SH SYNOPSIS
-.B ~/.bpython.ini
+.B ~/.bpython/config
 .SH DESCRIPTION
 The 
-.B bpython.ini
+.B config
 contains various options controlling the behaviour of 
 .B bpython
  .
diff --git a/light.theme b/light.theme
@@ -3,7 +3,8 @@
 # which stands for:
 #   blacK, Red, Green, Yellow, Blue, Magenta, Cyan, White, Default
 # Capital letters represent bold
-# Copy to ~/.bpython/foo.theme and set "color_scheme = foo" in ~/.bpython.ini
+# Copy to ~/.bpython/foo.theme and set "color_scheme = foo" in
+# ~/.bpython/config
 
 [syntax]
 keyword = M
diff --git a/sample-config b/sample-config
@@ -1,8 +1,7 @@
-
-# This is a standard python .ini file
+# This is a standard python config file
 # Valid values can be True, False, integer numbers, strings
-# By default bpython will look for ~/.bpython.ini or you can specify a file as
-# the first argument on the command line
+# By default bpython will look for ~/.bpython/config or you can specify a file
+# with the -c option on the command line
 
 # General section tag
 [general]
diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
     packages = ["bpython"],
     data_files = [
         (os.path.join(man_dir, 'man1'), ['doc/bpython.1']),
-        (os.path.join(man_dir, 'man5'), ['doc/bpython.ini.5']),
+        (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
         ('share/applications', ['data/bpython.desktop'])
     ],
     entry_points = {
