add more friendly error on theme load fail, add support for "cI" colours (I

bobf · bobf · commit 3c6e4c2a08f1 · 2009-06-11T15:53:46.000+01:00
being 'inverted')
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1167,10 +1167,12 @@ def echo(self, s, redraw=True):
                 fg = rx.groups()[0]
                 bg = rx.groups()[1]
                 col_num = self._C[fg.lower()]
-                if bg:
+                if bg and bg != 'I':
                     col_num *= self._C[bg.lower()]
 
                 a = curses.color_pair(int(col_num) + 1)
+                if bg == 'I':
+                    a = a | curses.A_REVERSE
                 s = re.sub('\x01[A-Za-z][A-Za-z]?', '', s)
                 if fg.isupper():
                     a = a | curses.A_BOLD
diff --git a/bpython/config.py b/bpython/config.py
@@ -1,4 +1,5 @@
 import os
+import sys
 from ConfigParser import ConfigParser, NoSectionError, NoOptionError
 from itertools import chain
 from bpython.keys import key_dispatch
@@ -65,16 +66,21 @@ def loadini(struct, configfile):
         }
     else:
         path = os.path.expanduser('~/.bpython/%s.theme' % (color_scheme_name,))
-        load_theme(struct, path)
+        load_theme(struct, path, configfile)
 
 
     # checks for valid key configuration this part still sucks
     for key in (struct.pastebin_key, struct.save_key):
         key_dispatch[key]
 
-def load_theme(struct, path):
+def load_theme(struct, path, inipath):
     theme = CP()
-    f = open(path, 'r')
+    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_scheme = {}
     for k, v in chain(theme.items('syntax'), theme.items('interface')):
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -94,7 +94,7 @@ def __init__(self, color_scheme, **options):
                 if k is Parenthesis:
                     # FIXME: Find a way to make this the inverse of the current
                     # background colour
-                    self.f_strings[k] += 'w'
+                    self.f_strings[k] += 'I'
         Formatter.__init__(self, **options)
 
     def format(self, tokensource, outfile):
