fix traceback colour not being customisable and (hopefully) improve light

bobf · bobf · commit 08c5b264bdb5 · 2009-06-06T20:45:01.000+01:00
colour scheme
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -151,6 +151,7 @@ def make_colours():
         'prompt': 'r',
         'output': 'k',
         'statusbar': 'r',
+        'error': 'b',
     }
     OPTS.dark = {
         'listwin': 'c',
@@ -166,6 +167,7 @@ def make_colours():
         'prompt': 'g',
         'output': 'w',
         'statusbar': 'c',
+        'error': 'y',
     }
     if OPTS.color_scheme == 'light':
         bg = 7
@@ -274,7 +276,7 @@ def showtraceback(self):
     def writetb(self, l):
         """This outputs the traceback and should be overridden for anything
         fancy."""
-        map(self.write, ["\x01y\x03%s" % (i, ) for i in l])
+        map(self.write, ["\x01%s\x03%s" % (OPTS.extras['error'], i) for i in l])
 
 
 class Repl(object):
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -71,20 +71,20 @@
 }
 
 f_strings_light = {
-    Keyword: "\x01b",
-    Name: "\x01k\x02",
-    Comment: "\x01b",
+    Keyword: "\x01y\x02",
+    Name: "\x01k",
+    Comment: "\x01g\x02",
     String: "\x01g",
     Error: "\x01r",
     Literal: "\x01r",
-    Literal.String: "\x01g",
+    Literal.String: "\x01b\x02",
     Token.Literal.Number.Float: "\x01g\x02",
     Number: "\x01g",
     Operator: "\x01b\x02",
     Operator.Word: "\x01k\x02",
     Punctuation: "\x01b\x02",
     Generic: "\x01d",
-    Token: "\x01b",
+    Token: "\x01r\x02",
     Whitespace: "\x02d",
 }
 
