fix bug in theme loading, add "cancel" option to save, and make filename input

bobf · bobf · commit 3940fe9ed5fc · 2009-06-08T23:11:03.000+01:00
for save use a colour
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -45,7 +45,6 @@
 import pydoc
 import types
 import unicodedata
-from itertools import chain
 from cStringIO import StringIO
 from locale import LC_ALL, getpreferredencoding, setlocale
 from optparse import OptionParser
@@ -325,6 +324,7 @@ def __init__(self, scr, interp, statusbar=None, idle=None):
         sys.stdin = FakeStdin(self)
         self.paste_mode = False
         self.last_key_press = time.time()
+        self.paste_time = 0.02
         sys.path.insert(0, '.')
 
         if not OPTS.arg_spec:
@@ -525,7 +525,8 @@ def check(self):
         """Check if paste mode should still be active and, if not, deactivate
         it and force syntax highlighting."""
 
-        if self.paste_mode and time.time() - self.last_key_press > 0.01:
+        if (self.paste_mode
+            and time.time() - self.last_key_press > self.paste_time):
             self.paste_mode = False
             self.print_line(self.s)
 
@@ -818,7 +819,11 @@ def write2file(self):
         """Prompt for a filename and write the current contents of the stdout
         buffer to disk."""
 
-        fn = self.statusbar.prompt('Save to file: ')
+        try:
+            fn = self.statusbar.prompt('Save to file (Esc to cancel): ')
+        except ValueError:
+            self.statusbar.message("Save cancelled.")
+            return
 
         if fn.startswith('~'):
             fn = os.path.expanduser(fn)
@@ -1614,7 +1619,7 @@ def get_key(self):
                     return key
             else:
                 t = time.time()
-                self.paste_mode = (t - self.last_key_press <= 0.01)
+                self.paste_mode = (t - self.last_key_press <= self.paste_time)
                 self.last_key_press = t
                 return key
             finally:
@@ -1722,14 +1727,17 @@ def bs(s):
                 o = bs(o)
                 continue
 
+            if c == 27:
+                raise ValueError
+
             if not c or c < 0 or c > 127:
                 continue
             c = chr(c)
 
             if c == '\n':
                 break
 
-            self.win.addstr(c)
+            self.win.addstr(c, get_colpair('prompt'))
             o += c
 
         self.settext(self._s)
@@ -1825,7 +1833,7 @@ def idle(caller):
 
     global stdscr
 
-    if importcompletion.find_coroutine():
+    if importcompletion.find_coroutine() or caller.paste_mode:
         stdscr.nodelay(True)
         key = stdscr.getch()
         stdscr.nodelay(False)
@@ -1903,6 +1911,7 @@ def main_curses(scr):
 
     scr.timeout(300)
 
+    curses.raw(True)
     main_win, statusbar = init_wins(scr, cols)
 
     curses.raw(True)
diff --git a/bpython/config.py b/bpython/config.py
@@ -1,5 +1,6 @@
 import os
 from ConfigParser import ConfigParser, NoSectionError, NoOptionError
+from itertools import chain
 
 
 class Struct(object):
@@ -64,11 +65,7 @@ def loadini(struct, configfile):
         }
     else:
         path = os.path.expanduser('~/.bpython/%s.theme' % (color_scheme_name,))
-        # XXX ConfigParser doesn't raise an IOError if it tries to read a file
-        # that doesn't exist which isn't helpful to us:
-        if not os.path.isfile(path):
-            raise IOError("'%s' is not a readable file" % (path,))
-        load_theme(struct, color_scheme_name)
+        load_theme(struct, path)
 
 
 def load_theme(struct, path):
