This closes #118

ikanobori · ikanobori · commit 84ad5f6bfdf7 · 2010-06-07T23:28:10.000+02:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -164,7 +164,7 @@ def loadini(struct, configfile):
         key_dispatch[key]
 
 # TODO consolidate
-def load_gtk_theme(struct, path, inipath, default_colors):
+def load_theme(struct, path, inipath, default_colors):
     theme = ConfigParser()
     try:
         f = open(path, 'r')
@@ -173,7 +173,7 @@ def load_gtk_theme(struct, path, inipath, default_colors):
                          (inipath, e))
         sys.exit(1)
     theme.readfp(f)
-    struct.color_gtk_scheme = {}
+    struct.color_scheme = {}
     for k, v in chain(theme.items('syntax'), theme.items('interface')):
         if theme.has_option('syntax', k):
             struct.color_scheme[k] = theme.get('syntax', k)
@@ -187,6 +187,29 @@ def load_gtk_theme(struct, path, inipath, default_colors):
     f.close()
 
 
+def load_gtk_theme(struct, path, inipath, default_colors):
+    theme = ConfigParser()
+    try:
+        f = open(path, 'r')
+    except (IOError, OSError), e:
+        sys.stdout.write("Error loading theme file specified in '%s':\n%s\n" %
+                         (inipath, e))
+        sys.exit(1)
+    theme.readfp(f)
+    struct.color_gtk_scheme = {}
+    for k, v in chain(theme.items('syntax'), theme.items('interface')):
+        if theme.has_option('syntax', k):
+            struct.color_gtk_scheme[k] = theme.get('syntax', k)
+        else:
+            struct.color_gtk_scheme[k] = theme.get('interface', k)
+
+    # Check against default theme to see if all values are defined
+    for k, v in default_colors.iteritems():
+        if k not in struct.color_gtk_scheme:
+            struct.color_gtk_scheme[k] = v
+    f.close()
+
+
 
 def migrate_rc(path):
     """Use the shlex module to convert the old configuration file to the new
