Add an input argument to *all* Display constructors.

Change the ibrowse and other constructors from
__init__(self, input=None, attrs=None) to
__init__(self, input=None, *attrs)

Move "import astyle" down as far as possible to avoid
problems wth circular imports.

IPython/Extensions/astyle.py

@@ -266,10 +266,7 b' else:'
         yield (-1, True)
         for info in self:
             yield info
-    try:
         ipipe.xrepr.when_type(Text)(xrepr_astyle_text)
-    except Exception:
-        pass
 
 
 def streamstyle(stream, styled=None):

IPython/Extensions/ibrowse.py

@@ -796,16 +796,14 b' class ibrowse(ipipe.Display):'
     keymap.register("refresh", "r")
     keymap.register("refreshfind", "R")
 
-    def __init__(self, input=None, attrs=None):
+    def __init__(self, input=None, *attrs):
         """
         Create a new browser. If ``attrs`` is not empty, it is the list
         of attributes that will be displayed in the browser, otherwise
         these will be determined by the objects on screen.
         """
-        self.input = input
+        ipipe.Display.__init__(self, input)
 
-        if attrs is None:
-            attrs = ()
         self.attrs = attrs
 
         # Stack of browser levels

IPython/Extensions/igrid.py

@@ -1102,13 +1102,10 b' class igrid(ipipe.Display):'
     (which is curses-based) or ``idump`` (which simply does a print).
     """
 
-    def __init__(self, input=None):
-        self.input = input
-
     if wx.VERSION < (2, 7):
         def display(self):
             try:
-                # Try to create a "standalone" from. If this works we're probably
+                # Try to create a "standalone" frame. If this works we're probably
                 # running with -wthread.
                 # Note that this sets the parent of the frame to None, but we can't
                 # pass a result object back to the shell anyway.

IPython/Extensions/ipipe.py

@@ -130,8 +130,6 b' except ImportError:'
     genutils = None
     ipapi = None
 
-import astyle
-
 
 __all__ = [
     "ifile", "ils", "iglob", "iwalk", "ipwdentry", "ipwd", "igrpentry", "igrp",
@@ -1932,6 +1930,9 b' class Display(object):'
         def __ror__(self, input):
             return input | self()
 
+    def __init__(self, input=None):
+        self.input = input
+
     def __ror__(self, input):
         self.input = input
         return self
@@ -2069,6 +2070,9 b' def xformat(value, mode, maxlength):'
     return (align, width, text)
 
 
+
+import astyle
+
 class idump(Display):
     # The approximate maximum length of a column entry
     maxattrlength = 200
@@ -2076,7 +2080,8 b' class idump(Display):'
     # Style for column names
     style_header = astyle.Style.fromstr("white:black:bold")
 
-    def __init__(self, *attrs):
+    def __init__(self, input=None, *attrs):
+        Display.__init__(self, input)
         self.attrs = [upgradexattr(attr) for attr in attrs]
         self.headerpadchar = " "
         self.headersepchar = "|"

doc/ChangeLog

@@ -1,8 +1,10 b''
 2008-01-19  Walter Doerwald  <[e-mail]>
 
-	* IPython/Extensions/ibrowse.py, IPython/Extensions/igrid.py:
-	The input object can now be passed to the constructor of ibrowse/igrid.
+	* ibrowse.py, igrid.py, ipipe.py:
+	The input object can now be passed to the constructor of the display classes.
 	This makes it possible to use them with objects that implement __or__.
+	* ipipe.py: Importing astyle.py is done as late as possible to
+	avoid problems with circular imports.
 	
 2008-01-19 Ville Vainio  <[e-mail]>