fix cli keymap to return tuple as default and remove shim

thomasballinger · thomasballinger · commit e75d99d4aca7 · 2013-08-22T11:58:25.000-04:00
--HG--
branch : scroll-frontend
extra : rebase_source : 285ed6b1cfaa61fda5ab341d668a1b2c29719ace
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -26,13 +26,14 @@
 
 class KeyMap:
 
-    def __init__(self):
+    def __init__(self, default=''):
         self.map = {}
+        self.default = default
 
     def __getitem__(self, key):
         if not key:
             # Unbound key
-            return str()
+            return self.default
         elif key in self.map:
             return self.map[key]
         else:
@@ -45,8 +46,8 @@ def __delitem__(self, key):
     def __setitem__(self, key, value):
         self.map[key] = value
 
-cli_key_dispatch = KeyMap()
-urwid_key_dispatch = KeyMap()
+cli_key_dispatch = KeyMap(tuple())
+urwid_key_dispatch = KeyMap('')
 
 # fill dispatch with letters
 for c in string.ascii_lowercase:
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -307,11 +307,6 @@ def add_normal_character(self, char):
     def process_event(self, e):
         """Returns True if shutting down, otherwise mutates state of Repl object"""
 
-        # shim for weird key_dispatch #TODO patch bpython
-        def tint(x):
-            """Tuple if not tuple - returns one-item tuple if x isn't a tuple"""
-            return x if isinstance(x, tuple) else tuple(x)
-
         #logging.debug("processing event %r", e)
         if isinstance(e, events.WindowChangeEvent):
             logging.debug('window change to %d %d', e.width, e.height)
@@ -356,7 +351,7 @@ def tint(x):
             raise SystemExit()
         elif e == "":
             raise KeyboardInterrupt()
-        elif e in ("",) + tint(key_dispatch[self.config.exit_key]):
+        elif e in ("",) + key_dispatch[self.config.exit_key]:
             raise SystemExit()
         elif e in ("\n", "\r", "PAD_ENTER"):
             self.on_enter()
