fix stupid bug (called str.upper instead of str.isupper to check upper case)

bobf · bobf · commit 1cc52aaa4c87 · 2009-06-08T11:27:35.000+01:00
and add light.theme to distribution
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1109,7 +1109,7 @@ def echo(self, s, redraw=True):
 
                 a = curses.color_pair(int(col_num) + 1)
                 s = re.sub('\x01[A-Za-z][A-Za-z]?', '', s)
-                if fg.upper():
+                if fg.isupper():
                     a = a | curses.A_BOLD
         s = s.replace('\x03', '')
         s = s.replace('\x01', '')
@@ -1735,7 +1735,7 @@ def settext(self, s, c=None, p=False):
 
         if s:
             if self.c:
-                self.win.addstr(s, curses.color_pair(self.c))
+                self.win.addstr(s, self.c)
             else:
                 self.win.addstr(s)
 
@@ -1769,7 +1769,7 @@ def init_wins(scr, cols):
 # 
     statusbar = Statusbar(scr, main_win,
         ".:: <C-d> Exit  <C-r> Rewind  <F2> Save  <F8> Pastebin ::.",
-            cols[OPTS.color_scheme['main']] + 1)
+            get_colpair('main'))
 
     return main_win, statusbar
 
diff --git a/light.theme b/light.theme
@@ -0,0 +1,23 @@
+# Each letter represent a colour marker: k, r, g, y, b, m, c, w
+# which stands for:    blacK, Red, Green, Yellow, Blue, Magenta,Cyan, White
+# Capital letters makes bold fonts
+# Copy to ~/.bpython/foo.theme and set "color_scheme = foo" in ~/.bpython.ini
+
+[syntax]
+keyword = M
+name = r
+comment = b
+string = g
+error = r
+number = B
+operator = c
+punctuation = b
+token = g
+other = b
+
+[interface]
+background = w
+output = b
+main = b
+prompt = r
+prompt_more = g
