Merged in thomasballinger/bpython (pull request #19)

sebastinas · sebastinas · commit 3fc47b7bfffa · 2013-11-23T16:21:03.000+01:00
Fix unbound cli KeyMap returning wrong type
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:
