Issue #123 fixed

mmaker · mmaker · commit 18f3d519035b · 2010-07-03T14:04:21.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -237,8 +237,14 @@ def __init__(self, config, statusbar=None):
 
     def confirm(self, q):
         """Ask for yes or no and return boolean"""
-        return self.statusbar.prompt(q).lower().startswith('y')
- 
+        try:
+            reply = self.statusbar.prompt(q)
+        except ValueError:
+            return False
+
+        return reply.lower() in ('y', 'yes')
+
+
     def notify(self, s, n=10):
         return self.statusbar.message(s, n)
 
@@ -1414,22 +1420,20 @@ def bs(s):
         while True:
             c = self.win.getch()
 
+            # '\b'
             if c == 127:
                 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':
+            # '\n'
+            elif c == 10:
                 break
-
-            self.win.addstr(c, get_colpair(self.config, 'prompt'))
-            o += c
+            # ESC
+            elif c == 27:
+                raise ValueError
+            # literal
+            elif 0 <= c < 127:
+                c = chr(c)
+                self.win.addstr(c, get_colpair(self.config, 'prompt'))
+                o += c
 
         self.settext(self._s)
         return o
