make colour scheme configurable. also fix quoting of strings in sample.ini

bobf · bobf · commit 2073f4f91aa1 · 2009-06-06T17:14:13.000+01:00
ini format apparently doesn't expect quotes (they'll be passed as part of the
actual string)
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1431,7 +1431,7 @@ def print_line(self, s, clr=False):
                     tokens = chain([(Token.String, value[3:])], tokens)
             else:
                 tokens = PythonLexer().get_tokens(s)
-            o = format(tokens, BPythonFormatter())
+            o = format(tokens, BPythonFormatter(OPTS.color_scheme))
         else:
             o = s
 
@@ -1838,6 +1838,7 @@ def safeget(self, section, option,  default):
     OPTS.hist_file = config.safeget('general', 'hist_file', '~/.pythonhist')
     OPTS.hist_length = config.safeget('general', 'hist_length', 100)
     OPTS.flush_output = config.safeget('general', 'flush_output', True)
+    OPTS.color_scheme = config.safeget('general', 'color_scheme', 'dark')
 
 
 class FakeDict(object):
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -100,7 +100,12 @@ class BPythonFormatter(Formatter):
     See the Pygments source for more info; it's pretty
     straightforward."""
 
-    def __init__(self, **options):
+    def __init__(self, color_scheme, **options):
+        if color_scheme == "light":
+            self.f_strings = f_strings_light
+        else:
+            self.f_strings = f_strings
+
         Formatter.__init__(self, **options)
 
     def format(self, tokensource, outfile):
@@ -109,10 +114,10 @@ def format(self, tokensource, outfile):
             if text == '\n':
                 continue
 
-            if token in f_strings:
-                o +=  "%s\x03%s\x04" % (f_strings[token], text )
+            if token in self.f_strings:
+                o +=  "%s\x03%s\x04" % (self.f_strings[token], text )
             else:
-                o += "%s\x03%s\x04" % (f_strings[Token], text )
+                o += "%s\x03%s\x04" % (self.f_strings[Token], text )
         outfile.write(o.rstrip())
 
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/sample.ini b/sample.ini
@@ -1,6 +1,6 @@
 
 # This is a standard python .ini file
-# Valid values can be True, False, integer numbers, quoted strings
+# 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
 
@@ -18,12 +18,16 @@ syntax = True
 # when possible (default: True).
 arg_spec = True
 
-# History file (default: "~/.pythonhist"):
-hist_file = "~/.pythonhist"
+# History file (default: ~/.pythonhist):
+hist_file = ~/.pythonhist
 
 # Number of lines to store in history (set to 0 to disable) (default: 100):
 hist_len = 100
 
 # Soft tab size (default: 4, see pep-8):
 tab_length = 4
 
+# Colour scheme can be "dark" or "light" (for dark and light background
+# terminals) (default: dark)
+color_scheme = dark
+
