Change C-d from quit key to delete key (by default).

Trundle · Trundle · commit 07c1ffc3b156 · 2010-01-09T02:19:16.000+01:00
Also bind forward to C-f and backward to C-b. This adresses issue #92. Thanks to Jeff Bauer for the initial patch.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -722,7 +722,12 @@ def p_key(self, key):
             self.complete()
             return ''
 
-        elif key == 'KEY_DC':  # Del
+        elif key in key_dispatch[config.delete_key] and not self.s:
+            # Delete on empty line exits
+            self.do_exit = True
+            return None
+
+        elif key in ('KEY_DC', ) + key_dispatch[config.delete_key]:
             self.delete()
             self.complete()
             # Redraw (as there might have been highlighted parens)
@@ -743,12 +748,12 @@ def p_key(self, key):
             self.fwd()
             return ''
 
-        elif key == 'KEY_LEFT':  # Cursor Left
+        elif key in ("KEY_LEFT",' ^B', chr(2)):  # Cursor Left or ^B
             self.mvc(1)
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
 
-        elif key == 'KEY_RIGHT':  # Cursor Right
+        elif key in ("KEY_RIGHT", '^F', chr(6)):  # Cursor Right or ^F
             self.mvc(-1)
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
diff --git a/bpython/config.py b/bpython/config.py
@@ -53,8 +53,9 @@ def loadini(struct, configfile):
             'clear_screen': 'C-l',
             'clear_word': 'C-w',
             'cut_to_buffer': 'C-k',
+            'delete': 'C-d',
             'down_one_line': 'C-n',
-            'exit': 'C-d',
+            'exit': '',
             'last_output': 'F9',
             'pastebin': 'F8',
             'save': 'C-s',
@@ -87,6 +88,7 @@ def loadini(struct, configfile):
     struct.clear_word_key = config.get('keyboard', 'clear_word')
     struct.clear_line_key = config.get('keyboard', 'clear_line')
     struct.clear_screen_key = config.get('keyboard', 'clear_screen')
+    struct.delete_key = config.get('keyboard', 'delete')
     struct.exit_key = config.get('keyboard', 'exit')
     struct.last_output_key = config.get('keyboard', 'last_output')
 
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -32,7 +32,10 @@ def __init__(self):
         self.map = {}
 
     def __getitem__(self, key):
-        if key in self.map:
+        if not key:
+            # Unbound key
+            return str()
+        elif key in self.map:
             return self.map[key]
         else:
             raise Exception('Configured keymap (%s)\
