Map the return key to enter() and shift-return to enterattr().

IPython/Extensions/igrid.py

@@ -391,7 +391,7 b' class IGridGrid(wx.grid.Grid):'
         keycode = event.GetKeyCode()
         if keycode == ord("P"):
             row = self.GetGridCursorRow()
-            if event.ShiftDown():
+            if sh:
                 col = self.GetGridCursorCol()
                 self.pickattr(row, col)
             else:
@@ -404,13 +404,13 b' class IGridGrid(wx.grid.Grid):'
                 self.pickrows(sorted(self.current_selection))
         elif keycode in (wx.WXK_BACK, wx.WXK_DELETE, ord("X")) and not (ctrl or sh):
             self.delete_current_notebook()
-        elif keycode == ord("E") and not (ctrl or sh):
-            row = self.GetGridCursorRow()
-            self.enter(row)
-        elif keycode == ord("E") and sh and not ctrl:
+        elif keycode in (ord("E"), ord("\r")):
             row = self.GetGridCursorRow()
+            if sh:
             col = self.GetGridCursorCol()
             self.enterattr(row, col)
+            else:
+                self.enter(row)
         elif keycode == ord("E") and ctrl:
             row = self.GetGridCursorRow()
             self.SetGridCursor(row, self.GetNumberCols()-1)

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Walter Doerwald  <[e-mail]>
+
+	* IPython/Extensions/igrid.py: Map the return key
+	to enter() and shift-return to enterattr().
+
 2007-03-30  Fernando Perez  <[e-mail]>
 
 	* IPython/Magic.py (magic_psearch): add unicode support by