From 5d57fb7b74b2b470aee50087fa3da3ab5931be3f 2006-11-24 16:48:17
From: walter.doerwald
Date: 2006-11-24 16:48:17
Subject: [PATCH] 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.

---

diff --git a/IPython/Extensions/astyle.py b/IPython/Extensions/astyle.py
index 4eb29ae..b86810c 100644
--- a/IPython/Extensions/astyle.py
+++ b/IPython/Extensions/astyle.py
@@ -258,7 +258,7 @@ class Text(list):
 
 
 try:
-    from IPython.Extensions import ipipe
+    import ipipe
 except ImportError:
     pass
 else:
diff --git a/IPython/Extensions/ibrowse.py b/IPython/Extensions/ibrowse.py
index ec4adcf..e5d4d87 100644
--- a/IPython/Extensions/ibrowse.py
+++ b/IPython/Extensions/ibrowse.py
@@ -742,7 +742,7 @@ 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")
diff --git a/IPython/Extensions/ipipe.py b/IPython/Extensions/ipipe.py
index a86f5b5..164daca 100644
--- a/IPython/Extensions/ipipe.py
+++ b/IPython/Extensions/ipipe.py
@@ -1212,7 +1212,7 @@ 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)" % \
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 77f4ec5..0b7d042 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-24  Walter Doerwald  <walter@livinglogic.de>
+	* 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  <vivainio@gmail.com>
 
 	* Magic.py, manual_base.lyx: Kirill Smelkov patch: