IPython/Extensions/astyle.py: Do a relative import of ipipe, so that

we don't get a duplicate ipipe module, where registration of the xrepr
implementation for Text is useless.

IPython/Extensions/ipipe.py: Fix __xrepr__() implementation for ils.

IPython/Extensions/ibrowse.py: Fix keymapping for the enter command.

IPython/Extensions/astyle.py

@@ -258,7 +258,7 b' class Text(list):'
 
 
 try:
-    from IPython.Extensions import ipipe
+    import ipipe
 except ImportError:
     pass
 else:

IPython/Extensions/ibrowse.py

@@ -742,7 +742,7 b' class ibrowse(ipipe.Display):'
     keymap.register("hideattr", "h")
     keymap.register("unhideattrs", "H")
     keymap.register("help", "?")
-    keymap.register("enter", "eenterdefault", "\r\n")
+    keymap.register("enter", "\r\n")
     keymap.register("enterattr", "E")
     # FIXME: What's happening here?
     keymap.register("leave", curses.KEY_BACKSPACE, "x\x08\x7f")

IPython/Extensions/ipipe.py

@@ -1212,7 +1212,7 b' class ils(Table):'
                     yield child
 
     def __xrepr__(self, mode="default"):
-       return ifile(self.base).__xrepr__(mode)
+       return xrepr(ifile(self.base), mode)
 
     def __repr__(self):
         return "%s.%s(%r)" % \

doc/ChangeLog

@@ -1,3 +1,12 b''
[phone]  Walter Doerwald  <[e-mail]>
+	* IPython/Extensions/astyle.py: Do a relative import of ipipe, so that
+	we don't get a duplicate ipipe module, where registration of the xrepr
+	implementation for Text is useless.
+
+	* IPython/Extensions/ipipe.py: Fix __xrepr__() implementation for ils.
+
+	* IPython/Extensions/ibrowse.py: Fix keymapping for the enter command.
+
 2006-11-24  Ville Vainio  <[e-mail]>
 
 	* Magic.py, manual_base.lyx: Kirill Smelkov patch: