urwid: Make C-e and C-a to do the right thing. This closes issue bpython#165.

Trundle · Trundle · commit 2e299fbf40e5 · 2011-02-27T01:53:57.000+01:00
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -288,22 +288,30 @@ def move_cursor_to_coords(self, *args):
         return False
 
     def keypress(self, size, key):
+        if urwid.command_map[key] in ['cursor up', 'cursor down']:
+            # Do not handle up/down arrow, leave them for the repl.
+            return key
+
         self._bpy_may_move_cursor = True
         try:
-            # Do not handle up/down arrow, leave them for the repl.
-            if urwid.command_map[key] in ('cursor up', 'cursor down'):
-                return key
+            if urwid.command_map[key] == 'cursor max left':
+                self.edit_pos = 0
+            elif urwid.command_map[key] == 'cursor max right':
+                self.edit_pos = len(self.get_edit_text())
             elif key == 'backspace':
                 line = self.get_edit_text()
                 cpos = len(line) - self.edit_pos
                 if not (cpos or len(line) % self.tab_length or line.strip()):
                     self.set_edit_text(line[:-self.tab_length])
-                    return None
+                else:
+                    return urwid.Edit.keypress(self, size, key)
             elif key == 'pastebin':
                 # do pastebin
                 pass
-            # TODO: Add in specific keypress fetching code here
-            return urwid.Edit.keypress(self, size, key)
+            else:
+                # TODO: Add in specific keypress fetching code here
+                return urwid.Edit.keypress(self, size, key)
+            return None
         finally:
             self._bpy_may_move_cursor = False
 
