ipapi.py => core/ipapi.py and imports updated.

IPython/Extensions/clearcmd.py

@@ -1,87 +1,87 b''
 # -*- coding: utf-8 -*-
 """ IPython extension: add %clear magic """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import gc
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def clear_f(self,arg):
     """ Clear various data (e.g. stored history data)
     
     %clear in  - clear input history
     %clear out - clear output history
     %clear shadow_compress - Compresses shadow history (to speed up ipython)
     %clear shadow_nuke - permanently erase all entries in shadow history
     %clear dhist - clear dir history
     %clear array - clear only variables that are NumPy arrays
     
     Examples:
 
     In [1]: clear in
     Flushing input history
 
     In [2]: clear shadow_compress
     Compressing shadow history
 
     In [3]: clear shadow_nuke
     Erased all keys from shadow history
 
     In [4]: clear dhist
     Clearing directory history
     """
     
     api = self.getapi()
     user_ns = self.user_ns  # local lookup, heavily used
         
     
     for target in arg.split():
 
         if target == 'out':
             print "Flushing output cache (%d entries)" % len(user_ns['_oh'])
             self.outputcache.flush()
 
         elif target == 'in':
             print "Flushing input history"
             pc = self.outputcache.prompt_count + 1
             for n in range(1, pc):
                 key = '_i'+`n`
                 user_ns.pop(key,None)
                 try:
                     del user_ns[key]
                 except: pass
             # must be done in-place
             self.input_hist[:] = ['\n'] * pc 
             self.input_hist_raw[:] = ['\n'] * pc
 
         elif target == 'array':
             # Support cleaning up numpy arrays
             try:
                 from numpy import ndarray
                 # This must be done with items and not iteritems because we're
                 # going to modify the dict in-place.
                 for x,val in user_ns.items():
                     if isinstance(val,ndarray):
                         del user_ns[x]
             except AttributeError:
                 print "Clear array only works if Numpy is available."
 
         elif target == 'shadow_compress':
             print "Compressing shadow history"
             api.db.hcompress('shadowhist')
             
         elif target == 'shadow_nuke':
             print "Erased all keys from shadow history "
             for k in ip.db.keys('shadowhist/*'):
                 del ip.db[k]
 
         elif target == 'dhist':
             print "Clearing directory history"
             del user_ns['_dh'][:]
 
     gc.collect()        
 
 # Activate the extension
 ip.expose_magic("clear",clear_f)
 import ipy_completers
 ipy_completers.quick_completer(
     '%clear','in out shadow_nuke shadow_compress dhist')

IPython/Extensions/envpersist.py

@@ -1,90 +1,90 b''
 # -*- coding: utf-8 -*-
 """ %env magic command for storing environment variables persistently
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 
 def restore_env(self):    
     ip = self.getapi()
     env = ip.db.get('stored_env', {'set' : {}, 'add' : [], 'pre' : []})
     for k,v in env['set'].items():
         os.environ[k] = v
     for k,v in env['add']:
         os.environ[k] = os.environ.get(k,"") + v
     for k,v in env['pre']:
         os.environ[k] = v + os.environ.get(k,"")
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
   
 ip.set_hook('late_startup_hook', restore_env)
 
 def persist_env(self, parameter_s=''):
     """ Store environment variables persistently
     
     IPython remembers the values across sessions, which is handy to avoid 
     editing startup files.
     
     %env - Show all environment variables
     %env VISUAL=jed  - set VISUAL to jed
     %env PATH+=;/foo - append ;foo to PATH
     %env PATH+=;/bar - also append ;bar to PATH
     %env PATH-=/wbin; - prepend /wbin; to PATH
     %env -d VISUAL   - forget VISUAL persistent val
     %env -p          - print all persistent env modifications 
     """
     
     if not parameter_s.strip():
         return os.environ.data
     
     ip = self.getapi()
     db = ip.db
     env = ip.db.get('stored_env', {'set' : {}, 'add' : [], 'pre' : []})
 
     if parameter_s.startswith('-p'):
         return env
         
     elif parameter_s.startswith('-d'):
         parts = (parameter_s.split()[1], '<del>')
         
     else:
         parts = parameter_s.strip().split('=')    
     
     if len(parts) == 2:
         k,v = [p.strip() for p in parts]
     
     if v == '<del>':
         if k in env['set']:
             del env['set'][k]
         env['add'] = [el for el in env['add'] if el[0] != k]
         env['pre'] = [el for el in env['pre'] if el[0] != k]
         
         print "Forgot '%s' (for next session)" % k
         
     elif k.endswith('+'):
         k = k[:-1]
         env['add'].append((k,v))
         os.environ[k] += v
         print k,"after append =",os.environ[k]
     elif k.endswith('-'):
         k = k[:-1]
         env['pre'].append((k,v))
         os.environ[k] = v + os.environ.get(k,"")
         print k,"after prepend =",os.environ[k]
         
         
     else:
         env['set'][k] = v
         print "Setting",k,"to",v
         os.environ[k] = v
         
     db['stored_env'] = env
 
 def env_completer(self,event):
     """ Custom completer that lists all env vars """
     return os.environ.keys()
 
 ip.expose_magic('env', persist_env)
 ip.set_hook('complete_command',env_completer, str_key = '%env')
 

IPython/Extensions/ext_rescapture.py

@@ -1,63 +1,63 b''
 # -*- coding: utf-8 -*-
 """ IPython extension: new prefilters for output grabbing 
 
 Provides 
 
 var = %magic blah blah
 
 var = !ls
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import *
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 import re
 
 def hnd_magic(line,mo):
     """ Handle a = %mymagic blah blah """
     #cmd = genutils.make_quoted_expr(mo.group('syscmd'))
     #mag = 'ipmagic
     #return "%s = %s"
     var = mo.group('varname')
     cmd = mo.group('cmd')
     expr = make_quoted_expr(cmd)
     return itpl('$var = _ip.magic($expr)')
 
 def hnd_syscmd(line,mo):
     """ Handle a = !ls """
     #cmd = genutils.make_quoted_expr(mo.group('syscmd'))
     #mag = 'ipmagic
     #return "%s = %s"
     var = mo.group('varname')
     cmd = mo.group('cmd')
     expr = make_quoted_expr(itpl("sc -l =$cmd"))
     return itpl('$var = _ip.magic($expr)')
 
 def install_re_handler(pat, hnd):
     ip.meta.re_prefilters.append((re.compile(pat), hnd))
 
 def init_handlers():
 
     ip.meta.re_prefilters = []
 
     install_re_handler('(?P<varname>[\w\.]+)\s*=\s*%(?P<cmd>.*)',
                        hnd_magic
                        )
     
     install_re_handler('(?P<varname>[\w\.]+)\s*=\s*!(?P<cmd>.*)',
                        hnd_syscmd
                        )
 
 init_handlers()
 
 def regex_prefilter_f(self,line):    
     for pat, handler in ip.meta.re_prefilters:
         mo = pat.match(line)
         if mo:
             return handler(line,mo)
     
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 ip.set_hook('input_prefilter', regex_prefilter_f)     

IPython/Extensions/ibrowse.py

@@ -1,1767 +1,1767 b''
 # -*- coding: iso-8859-1 -*-
 
 import curses, fcntl, signal, struct, tty, textwrap, inspect
 
-from IPython import ipapi
+from IPython.coreZ import ipapi
 
 import astyle, ipipe
 
 
 # Python 2.3 compatibility
 try:
     set
 except NameError:
     import sets
     set = sets.Set
 
 # Python 2.3 compatibility
 try:
     sorted
 except NameError:
     from ipipe import sorted
 
 
 class UnassignedKeyError(Exception):
     """
     Exception that is used for reporting unassigned keys.
     """
 
 
 class UnknownCommandError(Exception):
     """
     Exception that is used for reporting unknown commands (this should never
     happen).
     """
 
 
 class CommandError(Exception):
     """
     Exception that is used for reporting that a command can't be executed.
     """
 
 
 class Keymap(dict):
     """
     Stores mapping of keys to commands.
     """
     def __init__(self):
         self._keymap = {}
 
     def __setitem__(self, key, command):
         if isinstance(key, str):
             for c in key:
                 dict.__setitem__(self, ord(c), command)
         else:
             dict.__setitem__(self, key, command)
 
     def __getitem__(self, key):
         if isinstance(key, str):
             key = ord(key)
         return dict.__getitem__(self, key)
 
     def __detitem__(self, key):
         if isinstance(key, str):
             key = ord(key)
         dict.__detitem__(self, key)
 
     def register(self, command, *keys):
         for key in keys:
             self[key] = command
 
     def get(self, key, default=None):
         if isinstance(key, str):
             key = ord(key)
         return dict.get(self, key, default)
 
     def findkey(self, command, default=ipipe.noitem):
         for (key, commandcandidate) in self.iteritems():
             if commandcandidate == command:
                 return key
         if default is ipipe.noitem:
             raise KeyError(command)
         return default
 
 
 class _BrowserCachedItem(object):
     # This is used internally by ``ibrowse`` to store a item together with its
     # marked status.
     __slots__ = ("item", "marked")
 
     def __init__(self, item):
         self.item = item
         self.marked = False
 
 
 class _BrowserHelp(object):
     style_header = astyle.Style.fromstr("yellow:black:bold")
     # This is used internally by ``ibrowse`` for displaying the help screen.
     def __init__(self, browser):
         self.browser = browser
 
     def __xrepr__(self, mode):
         yield (-1, True)
         if mode == "header" or mode == "footer":
             yield (astyle.style_default, "ibrowse help screen")
         else:
             yield (astyle.style_default, repr(self))
 
     def __iter__(self):
         # Get reverse key mapping
         allkeys = {}
         for (key, cmd) in self.browser.keymap.iteritems():
             allkeys.setdefault(cmd, []).append(key)
 
         fields = ("key", "description")
 
         commands = []
         for name in dir(self.browser):
             if name.startswith("cmd_"):
                 command = getattr(self.browser, name)
                 commands.append((inspect.getsourcelines(command)[-1], name[4:], command))
         commands.sort()
         commands = [(c[1], c[2]) for c in commands]
         for (i, (name, command)) in enumerate(commands):
             if i:
                 yield ipipe.Fields(fields, key="", description="")
 
             description = command.__doc__
             if description is None:
                 lines = []
             else:
                 lines = [l.strip() for l in description.splitlines() if l.strip()]
                 description = "\n".join(lines)
                 lines = textwrap.wrap(description, 60)
             keys = allkeys.get(name, [])
 
             yield ipipe.Fields(fields, key="", description=astyle.Text((self.style_header, name)))
             for i in xrange(max(len(keys), len(lines))):
                 try:
                     key = self.browser.keylabel(keys[i])
                 except IndexError:
                     key = ""
                 try:
                     line = lines[i]
                 except IndexError:
                     line = ""
                 yield ipipe.Fields(fields, key=key, description=line)
 
 
 class _BrowserLevel(object):
     # This is used internally to store the state (iterator, fetch items,
     # position of cursor and screen, etc.) of one browser level
     # An ``ibrowse`` object keeps multiple ``_BrowserLevel`` objects in
     # a stack.
     def __init__(self, browser, input, mainsizey, *attrs):
         self.browser = browser
         self.input = input
         self.header = [x for x in ipipe.xrepr(input, "header") if not isinstance(x[0], int)]
         # iterator for the input
         self.iterator = ipipe.xiter(input)
 
         # is the iterator exhausted?
         self.exhausted = False
 
         # attributes to be display (autodetected if empty)
         self.attrs = attrs
 
         # fetched items (+ marked flag)
         self.items = ipipe.deque()
 
         # Number of marked objects
         self.marked = 0
 
         # Vertical cursor position
         self.cury = 0
 
         # Horizontal cursor position
         self.curx = 0
 
         # Index of first data column
         self.datastartx = 0
 
         # Index of first data line
         self.datastarty = 0
 
         # height of the data display area
         self.mainsizey = mainsizey
 
         # width of the data display area (changes when scrolling)
         self.mainsizex = 0
 
         # Size of row number (changes when scrolling)
         self.numbersizex = 0
 
         # Attributes to display (in this order)
         self.displayattrs = []
 
         # index and attribute under the cursor
         self.displayattr = (None, ipipe.noitem)
 
         # Maps attributes to column widths
         self.colwidths = {}
 
         # Set of hidden attributes
         self.hiddenattrs = set()
 
         # This takes care of all the caches etc.
         self.moveto(0, 0, refresh=True)
 
     def fetch(self, count):
         # Try to fill ``self.items`` with at least ``count`` objects.
         have = len(self.items)
         while not self.exhausted and have < count:
             try:
                 item = self.iterator.next()
             except StopIteration:
                 self.exhausted = True
                 break
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 have += 1
                 self.items.append(_BrowserCachedItem(exc))
                 self.exhausted = True
                 break
             else:
                 have += 1
                 self.items.append(_BrowserCachedItem(item))
 
     def calcdisplayattrs(self):
         # Calculate which attributes are available from the objects that are
         # currently visible on screen (and store it in ``self.displayattrs``)
 
         attrs = set()
         self.displayattrs = []
         if self.attrs:
             # If the browser object specifies a fixed list of attributes,
             # simply use it (removing hidden attributes).
             for attr in self.attrs:
                 attr = ipipe.upgradexattr(attr)
                 if attr not in attrs and attr not in self.hiddenattrs:
                     self.displayattrs.append(attr)
                     attrs.add(attr)
         else:
             endy = min(self.datastarty+self.mainsizey, len(self.items))
             for i in xrange(self.datastarty, endy):
                 for attr in ipipe.xattrs(self.items[i].item, "default"):
                     if attr not in attrs and attr not in self.hiddenattrs:
                         self.displayattrs.append(attr)
                         attrs.add(attr)
 
     def getrow(self, i):
         # Return a dictionary with the attributes for the object
         # ``self.items[i]``. Attribute names are taken from
         # ``self.displayattrs`` so ``calcdisplayattrs()`` must have been
         # called before.
         row = {}
         item = self.items[i].item
         for attr in self.displayattrs:
             try:
                 value = attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 value = exc
             # only store attribute if it exists (or we got an exception)
             if value is not ipipe.noitem:
                 # remember alignment, length and colored text
                 row[attr] = ipipe.xformat(value, "cell", self.browser.maxattrlength)
         return row
 
     def calcwidths(self):
         # Recalculate the displayed fields and their widths.
         # ``calcdisplayattrs()'' must have been called and the cache
         # for attributes of the objects on screen (``self.displayrows``)
         # must have been filled. This sets ``self.colwidths`` which maps
         # attribute descriptors to widths.
         self.colwidths = {}
         for row in self.displayrows:
             for attr in self.displayattrs:
                 try:
                     length = row[attr][1]
                 except KeyError:
                     length = 0
                 # always add attribute to colwidths, even if it doesn't exist
                 if attr not in self.colwidths:
                     self.colwidths[attr] = len(attr.name())
                 newwidth = max(self.colwidths[attr], length)
                 self.colwidths[attr] = newwidth
 
         # How many characters do we need to paint the largest item number?
         self.numbersizex = len(str(self.datastarty+self.mainsizey-1))
         # How must space have we got to display data?
         self.mainsizex = self.browser.scrsizex-self.numbersizex-3
         # width of all columns
         self.datasizex = sum(self.colwidths.itervalues()) + len(self.colwidths)
 
     def calcdisplayattr(self):
         # Find out which attribute the cursor is on and store this
         # information in ``self.displayattr``.
         pos = 0
         for (i, attr) in enumerate(self.displayattrs):
             if pos+self.colwidths[attr] >= self.curx:
                 self.displayattr = (i, attr)
                 break
             pos += self.colwidths[attr]+1
         else:
             self.displayattr = (None, ipipe.noitem)
 
     def moveto(self, x, y, refresh=False):
         # Move the cursor to the position ``(x,y)`` (in data coordinates,
         # not in screen coordinates). If ``refresh`` is true, all cached
         # values will be recalculated (e.g. because the list has been
         # resorted, so screen positions etc. are no longer valid).
         olddatastarty = self.datastarty
         oldx = self.curx
         oldy = self.cury
         x = int(x+0.5)
         y = int(y+0.5)
         newx = x # remember where we wanted to move
         newy = y # remember where we wanted to move
 
         scrollbordery = min(self.browser.scrollbordery, self.mainsizey//2)
         scrollborderx = min(self.browser.scrollborderx, self.mainsizex//2)
 
         # Make sure that the cursor didn't leave the main area vertically
         if y < 0:
             y = 0
         # try to get enough items to fill the screen
         self.fetch(max(y+scrollbordery+1, self.mainsizey))
         if y >= len(self.items):
             y = max(0, len(self.items)-1)
 
         # Make sure that the cursor stays on screen vertically
         if y < self.datastarty+scrollbordery:
             self.datastarty = max(0, y-scrollbordery)
         elif y >= self.datastarty+self.mainsizey-scrollbordery:
             self.datastarty = max(0, min(y-self.mainsizey+scrollbordery+1,
                                          len(self.items)-self.mainsizey))
 
         if refresh: # Do we need to refresh the complete display?
             self.calcdisplayattrs()
             endy = min(self.datastarty+self.mainsizey, len(self.items))
             self.displayrows = map(self.getrow, xrange(self.datastarty, endy))
             self.calcwidths()
         # Did we scroll vertically => update displayrows
         # and various other attributes
         elif self.datastarty != olddatastarty:
             # Recalculate which attributes we have to display
             olddisplayattrs = self.displayattrs
             self.calcdisplayattrs()
             # If there are new attributes, recreate the cache
             if self.displayattrs != olddisplayattrs:
                 endy = min(self.datastarty+self.mainsizey, len(self.items))
                 self.displayrows = map(self.getrow, xrange(self.datastarty, endy))
             elif self.datastarty<olddatastarty: # we did scroll up
                 # drop rows from the end
                 del self.displayrows[self.datastarty-olddatastarty:]
                 # fetch new items
                 for i in xrange(min(olddatastarty, self.datastarty+self.mainsizey)-1,
                                 self.datastarty-1, -1):
                     try:
                         row = self.getrow(i)
                     except IndexError:
                         # we didn't have enough objects to fill the screen
                         break
                     self.displayrows.insert(0, row)
             else: # we did scroll down
                 # drop rows from the start
                 del self.displayrows[:self.datastarty-olddatastarty]
                 # fetch new items
                 for i in xrange(max(olddatastarty+self.mainsizey, self.datastarty),
                                 self.datastarty+self.mainsizey):
                     try:
                         row = self.getrow(i)
                     except IndexError:
                         # we didn't have enough objects to fill the screen
                         break
                     self.displayrows.append(row)
             self.calcwidths()
 
         # Make sure that the cursor didn't leave the data area horizontally
         if x < 0:
             x = 0
         elif x >= self.datasizex:
             x = max(0, self.datasizex-1)
 
         # Make sure that the cursor stays on screen horizontally
         if x < self.datastartx+scrollborderx:
             self.datastartx = max(0, x-scrollborderx)
         elif x >= self.datastartx+self.mainsizex-scrollborderx:
             self.datastartx = max(0, min(x-self.mainsizex+scrollborderx+1,
                                          self.datasizex-self.mainsizex))
 
         if x == oldx and y == oldy and (x != newx or y != newy): # couldn't move
             self.browser.beep()
         else:
             self.curx = x
             self.cury = y
             self.calcdisplayattr()
 
     def sort(self, key, reverse=False):
         """
         Sort the currently list of items using the key function ``key``. If
         ``reverse`` is true the sort order is reversed.
         """
         curitem = self.items[self.cury] # Remember where the cursor is now
 
         # Sort items
         def realkey(item):
             return key(item.item)
         self.items = ipipe.deque(sorted(self.items, key=realkey, reverse=reverse))
 
         # Find out where the object under the cursor went
         cury = self.cury
         for (i, item) in enumerate(self.items):
             if item is curitem:
                 cury = i
                 break
 
         self.moveto(self.curx, cury, refresh=True)
 
     def refresh(self):
         """
         Restart iterating the input.
         """
         self.iterator = ipipe.xiter(self.input)
         self.items.clear()
         self.exhausted = False
         self.datastartx = self.datastarty = 0
         self.moveto(0, 0, refresh=True)
 
     def refreshfind(self):
         """
         Restart iterating the input and go back to the same object as before
         (if it can be found in the new iterator).
         """
         try:
             oldobject = self.items[self.cury].item
         except IndexError:
             oldobject = ipipe.noitem
         self.iterator = ipipe.xiter(self.input)
         self.items.clear()
         self.exhausted = False
         while True:
             self.fetch(len(self.items)+1)
             if self.exhausted:
                 curses.beep()
                 self.datastartx = self.datastarty = 0
                 self.moveto(self.curx, 0, refresh=True)
                 break
             if self.items[-1].item == oldobject:
                 self.datastartx = self.datastarty = 0
                 self.moveto(self.curx, len(self.items)-1, refresh=True)
                 break
 
 
 class _CommandInput(object):
     keymap = Keymap()
     keymap.register("left", curses.KEY_LEFT)
     keymap.register("right", curses.KEY_RIGHT)
     keymap.register("home", curses.KEY_HOME, "\x01") # Ctrl-A
     keymap.register("end", curses.KEY_END, "\x05") # Ctrl-E
     # FIXME: What's happening here?
     keymap.register("backspace", curses.KEY_BACKSPACE, "\x08\x7f")
     keymap.register("delete", curses.KEY_DC)
     keymap.register("delend", 0x0b) # Ctrl-K
     keymap.register("execute", "\r\n")
     keymap.register("up", curses.KEY_UP)
     keymap.register("down", curses.KEY_DOWN)
     keymap.register("incsearchup", curses.KEY_PPAGE)
     keymap.register("incsearchdown", curses.KEY_NPAGE)
     keymap.register("exit", "\x18"), # Ctrl-X
 
     def __init__(self, prompt):
         self.prompt = prompt
         self.history = []
         self.maxhistory = 100
         self.input = ""
         self.curx = 0
         self.cury = -1 # blank line
 
     def start(self):
         self.input = ""
         self.curx = 0
         self.cury = -1 # blank line
 
     def handlekey(self, browser, key):
         cmdname = self.keymap.get(key, None)
         if cmdname is not None:
             cmdfunc = getattr(self, "cmd_%s" % cmdname, None)
             if cmdfunc is not None:
                 return cmdfunc(browser)
             curses.beep()
         elif key != -1:
             try:
                 char = chr(key)
             except ValueError:
                 curses.beep()
             else:
                 return self.handlechar(browser, char)
 
     def handlechar(self, browser, char):
         self.input = self.input[:self.curx] + char + self.input[self.curx:]
         self.curx += 1
         return True
 
     def dohistory(self):
         self.history.insert(0, self.input)
         del self.history[:-self.maxhistory]
 
     def cmd_backspace(self, browser):
         if self.curx:
             self.input = self.input[:self.curx-1] + self.input[self.curx:]
             self.curx -= 1
             return True
         else:
             curses.beep()
 
     def cmd_delete(self, browser):
         if self.curx<len(self.input):
             self.input = self.input[:self.curx] + self.input[self.curx+1:]
             return True
         else:
             curses.beep()
 
     def cmd_delend(self, browser):
         if self.curx<len(self.input):
             self.input = self.input[:self.curx]
             return True
 
     def cmd_left(self, browser):
         if self.curx:
             self.curx -= 1
             return True
         else:
             curses.beep()
 
     def cmd_right(self, browser):
         if self.curx < len(self.input):
             self.curx += 1
             return True
         else:
             curses.beep()
 
     def cmd_home(self, browser):
         if self.curx:
             self.curx = 0
             return True
         else:
             curses.beep()
 
     def cmd_end(self, browser):
         if self.curx < len(self.input):
             self.curx = len(self.input)
             return True
         else:
             curses.beep()
 
     def cmd_up(self, browser):
         if self.cury < len(self.history)-1:
             self.cury += 1
             self.input = self.history[self.cury]
             self.curx = len(self.input)
             return True
         else:
             curses.beep()
 
     def cmd_down(self, browser):
         if self.cury >= 0:
             self.cury -= 1
             if self.cury>=0:
                 self.input = self.history[self.cury]
             else:
                 self.input = ""
             self.curx = len(self.input)
             return True
         else:
             curses.beep()
 
     def cmd_incsearchup(self, browser):
         prefix = self.input[:self.curx]
         cury = self.cury
         while True:
             cury += 1
             if cury >= len(self.history):
                 break
             if self.history[cury].startswith(prefix):
                 self.input = self.history[cury]
                 self.cury = cury
                 return True
         curses.beep()
 
     def cmd_incsearchdown(self, browser):
         prefix = self.input[:self.curx]
         cury = self.cury
         while True:
             cury -= 1
             if cury <= 0:
                 break
             if self.history[cury].startswith(prefix):
                 self.input = self.history[self.cury]
                 self.cury = cury
                 return True
         curses.beep()
 
     def cmd_exit(self, browser):
         browser.mode = "default"
         return True
 
     def cmd_execute(self, browser):
         raise NotImplementedError
 
 
 class _CommandGoto(_CommandInput):
     def __init__(self):
         _CommandInput.__init__(self, "goto object #")
 
     def handlechar(self, browser, char):
         # Only accept digits
         if not "0" <= char <= "9":
             curses.beep()
         else:
             return _CommandInput.handlechar(self, browser, char)
 
     def cmd_execute(self, browser):
         level = browser.levels[-1]
         if self.input:
             self.dohistory()
             level.moveto(level.curx, int(self.input))
         browser.mode = "default"
         return True
 
 
 class _CommandFind(_CommandInput):
     def __init__(self):
         _CommandInput.__init__(self, "find expression")
 
     def cmd_execute(self, browser):
         level = browser.levels[-1]
         if self.input:
             self.dohistory()
             while True:
                 cury = level.cury
                 level.moveto(level.curx, cury+1)
                 if cury == level.cury:
                     curses.beep()
                     break # hit end
                 item = level.items[level.cury].item
                 try:
                     globals = ipipe.getglobals(None)
                     if eval(self.input, globals, ipipe.AttrNamespace(item)):
                         break # found something
                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except Exception, exc:
                     browser.report(exc)
                     curses.beep()
                     break  # break on error
         browser.mode = "default"
         return True
 
 
 class _CommandFindBackwards(_CommandInput):
     def __init__(self):
         _CommandInput.__init__(self, "find backwards expression")
 
     def cmd_execute(self, browser):
         level = browser.levels[-1]
         if self.input:
             self.dohistory()
             while level.cury:
                 level.moveto(level.curx, level.cury-1)
                 item = level.items[level.cury].item
                 try:
                     globals = ipipe.getglobals(None)
                     if eval(self.input, globals, ipipe.AttrNamespace(item)):
                         break # found something
                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except Exception, exc:
                     browser.report(exc)
                     curses.beep()
                     break # break on error
             else:
                 curses.beep()
         browser.mode = "default"
         return True
 
 
 class ibrowse(ipipe.Display):
     # Show this many lines from the previous screen when paging horizontally
     pageoverlapx = 1
 
     # Show this many lines from the previous screen when paging vertically
     pageoverlapy = 1
 
     # Start scrolling when the cursor is less than this number of columns
     # away from the left or right screen edge
     scrollborderx = 10
 
     # Start scrolling when the cursor is less than this number of lines
     # away from the top or bottom screen edge
     scrollbordery = 5
 
     # Accelerate by this factor when scrolling horizontally
     acceleratex = 1.05
 
     # Accelerate by this factor when scrolling vertically
     acceleratey = 1.05
 
     # The maximum horizontal scroll speed
     # (as a factor of the screen width (i.e. 0.5 == half a screen width)
     maxspeedx = 0.5
 
     # The maximum vertical scroll speed
     # (as a factor of the screen height (i.e. 0.5 == half a screen height)
     maxspeedy = 0.5
 
     # The maximum number of header lines for browser level
     # if the nesting is deeper, only the innermost levels are displayed
     maxheaders = 5
 
     # The approximate maximum length of a column entry
     maxattrlength = 200
 
     # Styles for various parts of the GUI
     style_objheadertext = astyle.Style.fromstr("white:black:bold|reverse")
     style_objheadernumber = astyle.Style.fromstr("white:blue:bold|reverse")
     style_objheaderobject = astyle.Style.fromstr("white:black:reverse")
     style_colheader = astyle.Style.fromstr("blue:white:reverse")
     style_colheaderhere = astyle.Style.fromstr("green:black:bold|reverse")
     style_colheadersep = astyle.Style.fromstr("blue:black:reverse")
     style_number = astyle.Style.fromstr("blue:white:reverse")
     style_numberhere = astyle.Style.fromstr("green:black:bold|reverse")
     style_sep = astyle.Style.fromstr("blue:black")
     style_data = astyle.Style.fromstr("white:black")
     style_datapad = astyle.Style.fromstr("blue:black:bold")
     style_footer = astyle.Style.fromstr("black:white")
     style_report = astyle.Style.fromstr("white:black")
 
     # Column separator in header
     headersepchar = "|"
 
     # Character for padding data cell entries
     datapadchar = "."
 
     # Column separator in data area
     datasepchar = "|"
 
     # Character to use for "empty" cell (i.e. for non-existing attributes)
     nodatachar = "-"
 
     # Prompts for modes that require keyboard input
     prompts = {
         "goto": _CommandGoto(),
         "find": _CommandFind(),
         "findbackwards": _CommandFindBackwards()
     }
 
     # Maps curses key codes to "function" names
     keymap = Keymap()
     keymap.register("quit", "q")
     keymap.register("up", curses.KEY_UP)
     keymap.register("down", curses.KEY_DOWN)
     keymap.register("pageup", curses.KEY_PPAGE)
     keymap.register("pagedown", curses.KEY_NPAGE)
     keymap.register("left", curses.KEY_LEFT)
     keymap.register("right", curses.KEY_RIGHT)
     keymap.register("home", curses.KEY_HOME, "\x01")
     keymap.register("end", curses.KEY_END, "\x05")
     keymap.register("prevattr", "<\x1b")
     keymap.register("nextattr", ">\t")
     keymap.register("pick", "p")
     keymap.register("pickattr", "P")
     keymap.register("pickallattrs", "C")
     keymap.register("pickmarked", "m")
     keymap.register("pickmarkedattr", "M")
     keymap.register("pickinput", "i")
     keymap.register("pickinputattr", "I")
     keymap.register("hideattr", "h")
     keymap.register("unhideattrs", "H")
     keymap.register("help", "?")
     keymap.register("enter", "\r\n")
     keymap.register("enterattr", "E")
     # FIXME: What's happening here?
     keymap.register("leave", curses.KEY_BACKSPACE, "x\x08\x7f")
     keymap.register("detail", "d")
     keymap.register("detailattr", "D")
     keymap.register("tooglemark", " ")
     keymap.register("markrange", "%")
     keymap.register("sortattrasc", "v")
     keymap.register("sortattrdesc", "V")
     keymap.register("goto", "g")
     keymap.register("find", "f")
     keymap.register("findbackwards", "b")
     keymap.register("refresh", "r")
     keymap.register("refreshfind", "R")
 
     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.
         """
         ipipe.Display.__init__(self, input)
 
         self.attrs = attrs
 
         # Stack of browser levels
         self.levels = []
         # how many colums to scroll (Changes when accelerating)
         self.stepx = 1.
 
         # how many rows to scroll (Changes when accelerating)
         self.stepy = 1.
 
         # Beep on the edges of the data area? (Will be set to ``False``
         # once the cursor hits the edge of the screen, so we don't get
         # multiple beeps).
         self._dobeep = True
 
         # Cache for registered ``curses`` colors and styles.
         self._styles = {}
         self._colors = {}
         self._maxcolor = 1
 
         # How many header lines do we want to paint (the numbers of levels
         # we have, but with an upper bound)
         self._headerlines = 1
 
         # Index of first header line
         self._firstheaderline = 0
 
         # curses window
         self.scr = None
         # report in the footer line (error, executed command etc.)
         self._report = None
 
         # value to be returned to the caller (set by commands)
         self.returnvalue = None
 
         # The mode the browser is in
         # e.g. normal browsing or entering an argument for a command
         self.mode = "default"
 
         # set by the SIGWINCH signal handler
         self.resized = False
 
     def nextstepx(self, step):
         """
         Accelerate horizontally.
         """
         return max(1., min(step*self.acceleratex,
                            self.maxspeedx*self.levels[-1].mainsizex))
 
     def nextstepy(self, step):
         """
         Accelerate vertically.
         """
         return max(1., min(step*self.acceleratey,
                            self.maxspeedy*self.levels[-1].mainsizey))
 
     def getstyle(self, style):
         """
         Register the ``style`` with ``curses`` or get it from the cache,
         if it has been registered before.
         """
         try:
             return self._styles[style.fg, style.bg, style.attrs]
         except KeyError:
             attrs = 0
             for b in astyle.A2CURSES:
                 if style.attrs & b:
                     attrs |= astyle.A2CURSES[b]
             try:
                 color = self._colors[style.fg, style.bg]
             except KeyError:
                 curses.init_pair(
                     self._maxcolor,
                     astyle.COLOR2CURSES[style.fg],
                     astyle.COLOR2CURSES[style.bg]
                 )
                 color = curses.color_pair(self._maxcolor)
                 self._colors[style.fg, style.bg] = color
                 self._maxcolor += 1
             c = color | attrs
             self._styles[style.fg, style.bg, style.attrs] = c
             return c
 
     def addstr(self, y, x, begx, endx, text, style):
         """
         A version of ``curses.addstr()`` that can handle ``x`` coordinates
         that are outside the screen.
         """
         text2 = text[max(0, begx-x):max(0, endx-x)]
         if text2:
             self.scr.addstr(y, max(x, begx), text2, self.getstyle(style))
         return len(text)
 
     def addchr(self, y, x, begx, endx, c, l, style):
         x0 = max(x, begx)
         x1 = min(x+l, endx)
         if x1>x0:
             self.scr.addstr(y, x0, c*(x1-x0), self.getstyle(style))
         return l
 
     def _calcheaderlines(self, levels):
         # Calculate how many headerlines do we have to display, if we have
         # ``levels`` browser levels
         if levels is None:
             levels = len(self.levels)
         self._headerlines = min(self.maxheaders, levels)
         self._firstheaderline = levels-self._headerlines
 
     def getstylehere(self, style):
         """
         Return a style for displaying the original style ``style``
         in the row the cursor is on.
         """
         return astyle.Style(style.fg, astyle.COLOR_BLUE, style.attrs | astyle.A_BOLD)
 
     def report(self, msg):
         """
         Store the message ``msg`` for display below the footer line. This
         will be displayed as soon as the screen is redrawn.
         """
         self._report = msg
 
     def enter(self, item, *attrs):
         """
         Enter the object ``item``. If ``attrs`` is specified, it will be used
         as a fixed list of attributes to display.
         """
         if self.levels and item is self.levels[-1].input:
             curses.beep()
             self.report(CommandError("Recursion on input object"))
         else:
             oldlevels = len(self.levels)
             self._calcheaderlines(oldlevels+1)
             try:
                 level = _BrowserLevel(
                     self,
                     item,
                     self.scrsizey-1-self._headerlines-2,
                     *attrs
                 )
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 if not self.levels:
                     raise
                 self._calcheaderlines(oldlevels)
                 curses.beep()
                 self.report(exc)
             else:
                 self.levels.append(level)
 
     def startkeyboardinput(self, mode):
         """
         Enter mode ``mode``, which requires keyboard input.
         """
         self.mode = mode
         self.prompts[mode].start()
 
     def keylabel(self, keycode):
         """
         Return a pretty name for the ``curses`` key ``keycode`` (used in the
         help screen and in reports about unassigned keys).
         """
         if keycode <= 0xff:
             specialsnames = {
                 ord("\n"): "RETURN",
                 ord(" "): "SPACE",
                 ord("\t"): "TAB",
                 ord("\x7f"): "DELETE",
                 ord("\x08"): "BACKSPACE",
             }
             if keycode in specialsnames:
                 return specialsnames[keycode]
             elif 0x00 < keycode < 0x20:
                 return "CTRL-%s" % chr(keycode + 64)
             return repr(chr(keycode))
         for name in dir(curses):
             if name.startswith("KEY_") and getattr(curses, name) == keycode:
                 return name
         return str(keycode)
 
     def beep(self, force=False):
         if force or self._dobeep:
             curses.beep()
             # don't beep again (as long as the same key is pressed)
             self._dobeep = False
 
     def cmd_up(self):
         """
         Move the cursor to the previous row.
         """
         level = self.levels[-1]
         self.report("up")
         level.moveto(level.curx, level.cury-self.stepy)
 
     def cmd_down(self):
         """
         Move the cursor to the next row.
         """
         level = self.levels[-1]
         self.report("down")
         level.moveto(level.curx, level.cury+self.stepy)
 
     def cmd_pageup(self):
         """
         Move the cursor up one page.
         """
         level = self.levels[-1]
         self.report("page up")
         level.moveto(level.curx, level.cury-level.mainsizey+self.pageoverlapy)
 
     def cmd_pagedown(self):
         """
         Move the cursor down one page.
         """
         level = self.levels[-1]
         self.report("page down")
         level.moveto(level.curx, level.cury+level.mainsizey-self.pageoverlapy)
 
     def cmd_left(self):
         """
         Move the cursor left.
         """
         level = self.levels[-1]
         self.report("left")
         level.moveto(level.curx-self.stepx, level.cury)
 
     def cmd_right(self):
         """
         Move the cursor right.
         """
         level = self.levels[-1]
         self.report("right")
         level.moveto(level.curx+self.stepx, level.cury)
 
     def cmd_home(self):
         """
         Move the cursor to the first column.
         """
         level = self.levels[-1]
         self.report("home")
         level.moveto(0, level.cury)
 
     def cmd_end(self):
         """
         Move the cursor to the last column.
         """
         level = self.levels[-1]
         self.report("end")
         level.moveto(level.datasizex+level.mainsizey-self.pageoverlapx, level.cury)
 
     def cmd_prevattr(self):
         """
         Move the cursor one attribute column to the left.
         """
         level = self.levels[-1]
         if level.displayattr[0] is None or level.displayattr[0] == 0:
             self.beep()
         else:
             self.report("prevattr")
             pos = 0
             for (i, attrname) in enumerate(level.displayattrs):
                 if i == level.displayattr[0]-1:
                     break
                 pos += level.colwidths[attrname] + 1
             level.moveto(pos, level.cury)
 
     def cmd_nextattr(self):
         """
         Move the cursor one attribute column to the right.
         """
         level = self.levels[-1]
         if level.displayattr[0] is None or level.displayattr[0] == len(level.displayattrs)-1:
             self.beep()
         else:
             self.report("nextattr")
             pos = 0
             for (i, attrname) in enumerate(level.displayattrs):
                 if i == level.displayattr[0]+1:
                     break
                 pos += level.colwidths[attrname] + 1
             level.moveto(pos, level.cury)
 
     def cmd_pick(self):
         """
         'Pick' the object under the cursor (i.e. the row the cursor is on).
         This leaves the browser and returns the picked object to the caller.
         (In IPython this object will be available as the ``_`` variable.)
         """
         level = self.levels[-1]
         self.returnvalue = level.items[level.cury].item
         return True
 
     def cmd_pickattr(self):
         """
         'Pick' the attribute under the cursor (i.e. the row/column the
         cursor is on).
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         value = attr.value(level.items[level.cury].item)
         if value is ipipe.noitem:
             curses.beep()
             self.report(AttributeError(attr.name()))
         else:
             self.returnvalue = value
             return True
 
     def cmd_pickallattrs(self):
         """
         Pick' the complete column under the cursor (i.e. the attribute under
         the cursor) from all currently fetched objects. These attributes
         will be returned as a list.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         result = []
         for cache in level.items:
             value = attr.value(cache.item)
             if value is not ipipe.noitem:
                 result.append(value)
         self.returnvalue = result
         return True
 
     def cmd_pickmarked(self):
         """
         'Pick' marked objects. Marked objects will be returned as a list.
         """
         level = self.levels[-1]
         self.returnvalue = [cache.item for cache in level.items if cache.marked]
         return True
 
     def cmd_pickmarkedattr(self):
         """
         'Pick' the attribute under the cursor from all marked objects
         (This returns a list).
         """
 
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         result = []
         for cache in level.items:
             if cache.marked:
                 value = attr.value(cache.item)
                 if value is not ipipe.noitem:
                     result.append(value)
         self.returnvalue = result
         return True
 
     def cmd_pickinput(self):
         """
         Use the object under the cursor (i.e. the row the cursor is on) as
         the next input line. This leaves the browser and puts the picked object
         in the input.
         """
         level = self.levels[-1]
         value = level.items[level.cury].item
         self.returnvalue = None
         api = ipapi.get()
         api.set_next_input(str(value))
         return True
 
     def cmd_pickinputattr(self):
         """
         Use the attribute under the cursor i.e. the row/column the cursor is on)
         as the next input line. This leaves the browser and puts the picked
         object in the input.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         value = attr.value(level.items[level.cury].item)
         if value is ipipe.noitem:
             curses.beep()
             self.report(AttributeError(attr.name()))
         self.returnvalue = None
         api = ipapi.get()
         api.set_next_input(str(value))
         return True
 
     def cmd_markrange(self):
         """
         Mark all objects from the last marked object before the current cursor
         position to the cursor position.
         """
         level = self.levels[-1]
         self.report("markrange")
         start = None
         if level.items:
             for i in xrange(level.cury, -1, -1):
                 if level.items[i].marked:
                     start = i
                     break
         if start is None:
             self.report(CommandError("no mark before cursor"))
             curses.beep()
         else:
             for i in xrange(start, level.cury+1):
                 cache = level.items[i]
                 if not cache.marked:
                     cache.marked = True
                     level.marked += 1
 
     def cmd_enter(self):
         """
         Enter the object under the cursor. (what this mean depends on the object
         itself (i.e. how it implements iteration). This opens a new browser 'level'.
         """
         level = self.levels[-1]
         try:
             item = level.items[level.cury].item
         except IndexError:
             self.report(CommandError("No object"))
             curses.beep()
         else:
             self.report("entering object...")
             self.enter(item)
 
     def cmd_leave(self):
         """
         Leave the current browser level and go back to the previous one.
         """
         self.report("leave")
         if len(self.levels) > 1:
             self._calcheaderlines(len(self.levels)-1)
             self.levels.pop(-1)
         else:
             self.report(CommandError("This is the last level"))
             curses.beep()
 
     def cmd_enterattr(self):
         """
         Enter the attribute under the cursor.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         try:
             item = level.items[level.cury].item
         except IndexError:
             self.report(CommandError("No object"))
             curses.beep()
         else:
             value = attr.value(item)
             name = attr.name()
             if value is ipipe.noitem:
                 self.report(AttributeError(name))
             else:
                 self.report("entering object attribute %s..." % name)
                 self.enter(value)
 
     def cmd_detail(self):
         """
         Show a detail view of the object under the cursor. This shows the
         name, type, doc string and value of the object attributes (and it
         might show more attributes than in the list view, depending on
         the object).
         """
         level = self.levels[-1]
         try:
             item = level.items[level.cury].item
         except IndexError:
             self.report(CommandError("No object"))
             curses.beep()
         else:
             self.report("entering detail view for object...")
             attrs = [ipipe.AttributeDetail(item, attr) for attr in ipipe.xattrs(item, "detail")]
             self.enter(attrs)
 
     def cmd_detailattr(self):
         """
         Show a detail view of the attribute under the cursor.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no attribute"))
             return
         try:
             item = level.items[level.cury].item
         except IndexError:
             self.report(CommandError("No object"))
             curses.beep()
         else:
             try:
                 item = attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 self.report(exc)
             else:
                 self.report("entering detail view for attribute %s..." % attr.name())
                 attrs = [ipipe.AttributeDetail(item, attr) for attr in ipipe.xattrs(item, "detail")]
                 self.enter(attrs)
 
     def cmd_tooglemark(self):
         """
         Mark/unmark the object under the cursor. Marked objects have a '!'
         after the row number).
         """
         level = self.levels[-1]
         self.report("toggle mark")
         try:
             item = level.items[level.cury]
         except IndexError: # no items?
             pass
         else:
             if item.marked:
                 item.marked = False
                 level.marked -= 1
             else:
                 item.marked = True
                 level.marked += 1
 
     def cmd_sortattrasc(self):
         """
         Sort the objects (in ascending order) using the attribute under
         the cursor as the sort key.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         self.report("sort by %s (ascending)" % attr.name())
         def key(item):
             try:
                 return attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception:
                 return None
         level.sort(key)
 
     def cmd_sortattrdesc(self):
         """
         Sort the objects (in descending order) using the attribute under
         the cursor as the sort key.
         """
         level = self.levels[-1]
         attr = level.displayattr[1]
         if attr is ipipe.noitem:
             curses.beep()
             self.report(CommandError("no column under cursor"))
             return
         self.report("sort by %s (descending)" % attr.name())
         def key(item):
             try:
                 return attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception:
                 return None
         level.sort(key, reverse=True)
 
     def cmd_hideattr(self):
         """
         Hide the attribute under the cursor.
         """
         level = self.levels[-1]
         if level.displayattr[0] is None:
             self.beep()
         else:
             self.report("hideattr")
             level.hiddenattrs.add(level.displayattr[1])
             level.moveto(level.curx, level.cury, refresh=True)
 
     def cmd_unhideattrs(self):
         """
         Make all attributes visible again.
         """
         level = self.levels[-1]
         self.report("unhideattrs")
         level.hiddenattrs.clear()
         level.moveto(level.curx, level.cury, refresh=True)
 
     def cmd_goto(self):
         """
         Jump to a row. The row number can be entered at the
         bottom of the screen.
         """
         self.startkeyboardinput("goto")
 
     def cmd_find(self):
         """
         Search forward for a row. The search condition can be entered at the
         bottom of the screen.
         """
         self.startkeyboardinput("find")
 
     def cmd_findbackwards(self):
         """
         Search backward for a row. The search condition can be entered at the
         bottom of the screen.
         """
         self.startkeyboardinput("findbackwards")
 
     def cmd_refresh(self):
         """
         Refreshes the display by restarting the iterator.
         """
         level = self.levels[-1]
         self.report("refresh")
         level.refresh()
 
     def cmd_refreshfind(self):
         """
         Refreshes the display by restarting the iterator and goes back to the
         same object the cursor was on before restarting (if this object can't be
         found the cursor jumps back to the first object).
         """
         level = self.levels[-1]
         self.report("refreshfind")
         level.refreshfind()
 
     def cmd_help(self):
         """
         Opens the help screen as a new browser level, describing keyboard
         shortcuts.
         """
         for level in self.levels:
             if isinstance(level.input, _BrowserHelp):
                 curses.beep()
                 self.report(CommandError("help already active"))
                 return
 
         self.enter(_BrowserHelp(self))
 
     def cmd_quit(self):
         """
         Quit the browser and return to the IPython prompt.
         """
         self.returnvalue = None
         return True
 
     def sigwinchhandler(self, signal, frame):
         self.resized = True
 
     def _dodisplay(self, scr):
         """
         This method is the workhorse of the browser. It handles screen
         drawing and the keyboard.
         """
         self.scr = scr
         curses.halfdelay(1)
         footery = 2
 
         keys = []
         for cmd in ("quit", "help"):
             key = self.keymap.findkey(cmd, None)
             if key is not None:
                 keys.append("%s=%s" % (self.keylabel(key), cmd))
         helpmsg = " | %s" % " ".join(keys)
 
         scr.clear()
         msg = "Fetching first batch of objects..."
         (self.scrsizey, self.scrsizex) = scr.getmaxyx()
         scr.addstr(self.scrsizey//2, (self.scrsizex-len(msg))//2, msg)
         scr.refresh()
 
         lastc = -1
 
         self.levels = []
         # enter the first level
         self.enter(self.input, *self.attrs)
 
         self._calcheaderlines(None)
 
         while True:
             level = self.levels[-1]
             (self.scrsizey, self.scrsizex) = scr.getmaxyx()
             level.mainsizey = self.scrsizey-1-self._headerlines-footery
 
             # Paint object header
             for i in xrange(self._firstheaderline, self._firstheaderline+self._headerlines):
                 lv = self.levels[i]
                 posx = 0
                 posy = i-self._firstheaderline
                 endx = self.scrsizex
                 if i: # not the first level
                     msg = " (%d/%d" % (self.levels[i-1].cury, len(self.levels[i-1].items))
                     if not self.levels[i-1].exhausted:
                         msg += "+"
                     msg += ") "
                     endx -= len(msg)+1
                 posx += self.addstr(posy, posx, 0, endx, " ibrowse #%d: " % i, self.style_objheadertext)
                 for (style, text) in lv.header:
                     posx += self.addstr(posy, posx, 0, endx, text, self.style_objheaderobject)
                     if posx >= endx:
                         break
                 if i:
                     posx += self.addstr(posy, posx, 0, self.scrsizex, msg, self.style_objheadernumber)
                 posx += self.addchr(posy, posx, 0, self.scrsizex, " ", self.scrsizex-posx, self.style_objheadernumber)
 
             if not level.items:
                 self.addchr(self._headerlines, 0, 0, self.scrsizex, " ", self.scrsizex, self.style_colheader)
                 self.addstr(self._headerlines+1, 0, 0, self.scrsizex, " <empty>", astyle.style_error)
                 scr.clrtobot()
             else:
                 # Paint column headers
                 scr.move(self._headerlines, 0)
                 scr.addstr(" %*s " % (level.numbersizex, "#"), self.getstyle(self.style_colheader))
                 scr.addstr(self.headersepchar, self.getstyle(self.style_colheadersep))
                 begx = level.numbersizex+3
                 posx = begx-level.datastartx
                 for attr in level.displayattrs:
                     attrname = attr.name()
                     cwidth = level.colwidths[attr]
                     header = attrname.ljust(cwidth)
                     if attr is level.displayattr[1]:
                         style = self.style_colheaderhere
                     else:
                         style = self.style_colheader
                     posx += self.addstr(self._headerlines, posx, begx, self.scrsizex, header, style)
                     posx += self.addstr(self._headerlines, posx, begx, self.scrsizex, self.headersepchar, self.style_colheadersep)
                     if posx >= self.scrsizex:
                         break
                 else:
                     scr.addstr(" "*(self.scrsizex-posx), self.getstyle(self.style_colheader))
 
                 # Paint rows
                 posy = self._headerlines+1+level.datastarty
                 for i in xrange(level.datastarty, min(level.datastarty+level.mainsizey, len(level.items))):
                     cache = level.items[i]
                     if i == level.cury:
                         style = self.style_numberhere
                     else:
                         style = self.style_number
 
                     posy = self._headerlines+1+i-level.datastarty
                     posx = begx-level.datastartx
 
                     scr.move(posy, 0)
                     scr.addstr(" %*d%s" % (level.numbersizex, i, " !"[cache.marked]), self.getstyle(style))
                     scr.addstr(self.headersepchar, self.getstyle(self.style_sep))
 
                     for attrname in level.displayattrs:
                         cwidth = level.colwidths[attrname]
                         try:
                             (align, length, parts) = level.displayrows[i-level.datastarty][attrname]
                         except KeyError:
                             align = 2
                             style = astyle.style_nodata
                             if i == level.cury:
                                 style = self.getstylehere(style)
                         padstyle = self.style_datapad
                         sepstyle = self.style_sep
                         if i == level.cury:
                             padstyle = self.getstylehere(padstyle)
                             sepstyle = self.getstylehere(sepstyle)
                         if align == 2:
                             posx += self.addchr(posy, posx, begx, self.scrsizex, self.nodatachar, cwidth, style)
                         else:
                             if align == 1:
                                 posx += self.addchr(posy, posx, begx, self.scrsizex, self.datapadchar, cwidth-length, padstyle)
                             elif align == 0:
                                 pad1 = (cwidth-length)//2
                                 pad2 = cwidth-length-len(pad1)
                                 posx += self.addchr(posy, posx, begx, self.scrsizex, self.datapadchar, pad1, padstyle)
                             for (style, text) in parts:
                                 if i == level.cury:
                                     style = self.getstylehere(style)
                                 posx += self.addstr(posy, posx, begx, self.scrsizex, text, style)
                                 if posx >= self.scrsizex:
                                     break
                             if align == -1:
                                 posx += self.addchr(posy, posx, begx, self.scrsizex, self.datapadchar, cwidth-length, padstyle)
                             elif align == 0:
                                 posx += self.addchr(posy, posx, begx, self.scrsizex, self.datapadchar, pad2, padstyle)
                         posx += self.addstr(posy, posx, begx, self.scrsizex, self.datasepchar, sepstyle)
                     else:
                         scr.clrtoeol()
 
                 # Add blank row headers for the rest of the screen
                 for posy in xrange(posy+1, self.scrsizey-2):
                     scr.addstr(posy, 0, " " * (level.numbersizex+2), self.getstyle(self.style_colheader))
                     scr.clrtoeol()
 
             posy = self.scrsizey-footery
             # Display footer
             scr.addstr(posy, 0, " "*self.scrsizex, self.getstyle(self.style_footer))
 
             if level.exhausted:
                 flag = ""
             else:
                 flag = "+"
 
             endx = self.scrsizex-len(helpmsg)-1
             scr.addstr(posy, endx, helpmsg, self.getstyle(self.style_footer))
 
             posx = 0
             msg = " %d%s objects (%d marked): " % (len(level.items), flag, level.marked)
             posx += self.addstr(posy, posx, 0, endx, msg, self.style_footer)
             try:
                 item = level.items[level.cury].item
             except IndexError: # empty
                 pass
             else:
                 for (nostyle, text) in ipipe.xrepr(item, "footer"):
                     if not isinstance(nostyle, int):
                         posx += self.addstr(posy, posx, 0, endx, text, self.style_footer)
                         if posx >= endx:
                             break
 
                 attrstyle = [(astyle.style_default, "no attribute")]
                 attr = level.displayattr[1]
                 if attr is not ipipe.noitem and not isinstance(attr, ipipe.SelfDescriptor):
                     posx += self.addstr(posy, posx, 0, endx, " | ", self.style_footer)
                     posx += self.addstr(posy, posx, 0, endx, attr.name(), self.style_footer)
                     posx += self.addstr(posy, posx, 0, endx, ": ", self.style_footer)
                     try:
                         value = attr.value(item)
                     except (SystemExit, KeyboardInterrupt):
                         raise
                     except Exception, exc:
                         value = exc
                     if value is not ipipe.noitem:
                         attrstyle = ipipe.xrepr(value, "footer")
                     for (nostyle, text) in attrstyle:
                         if not isinstance(nostyle, int):
                             posx += self.addstr(posy, posx, 0, endx, text, self.style_footer)
                             if posx >= endx:
                                 break
 
             try:
                 # Display input prompt
                 if self.mode in self.prompts:
                     history = self.prompts[self.mode]
                     posx = 0
                     posy = self.scrsizey-1
                     posx += self.addstr(posy, posx, 0, endx, history.prompt, astyle.style_default)
                     posx += self.addstr(posy, posx, 0, endx, " [", astyle.style_default)
                     if history.cury==-1:
                         text = "new"
                     else:
                         text = str(history.cury+1)
                     posx += self.addstr(posy, posx, 0, endx, text, astyle.style_type_number)
                     if history.history:
                         posx += self.addstr(posy, posx, 0, endx, "/", astyle.style_default)
                         posx += self.addstr(posy, posx, 0, endx, str(len(history.history)), astyle.style_type_number)
                     posx += self.addstr(posy, posx, 0, endx, "]: ", astyle.style_default)
                     inputstartx = posx
                     posx += self.addstr(posy, posx, 0, endx, history.input, astyle.style_default)
                 # Display report
                 else:
                     if self._report is not None:
                         if isinstance(self._report, Exception):
                             style = self.getstyle(astyle.style_error)
                             if self._report.__class__.__module__ == "exceptions":
                                 msg = "%s: %s" % \
                                       (self._report.__class__.__name__, self._report)
                             else:
                                 msg = "%s.%s: %s" % \
                                       (self._report.__class__.__module__,
                                        self._report.__class__.__name__, self._report)
                         else:
                             style = self.getstyle(self.style_report)
                             msg = self._report
                         scr.addstr(self.scrsizey-1, 0, msg[:self.scrsizex], style)
                         self._report = None
                     else:
                         scr.move(self.scrsizey-1, 0)
             except curses.error:
                 # Protect against errors from writing to the last line
                 pass
             scr.clrtoeol()
 
             # Position cursor
             if self.mode in self.prompts:
                 history = self.prompts[self.mode]
                 scr.move(self.scrsizey-1, inputstartx+history.curx)
             else:
                 scr.move(
                     1+self._headerlines+level.cury-level.datastarty,
                     level.numbersizex+3+level.curx-level.datastartx
                 )
             scr.refresh()
 
             # Check keyboard
             while True:
                 c = scr.getch()
                 if self.resized:
                     size = fcntl.ioctl(0, tty.TIOCGWINSZ, "12345678")
                     size = struct.unpack("4H", size)
                     oldsize = scr.getmaxyx()
                     scr.erase()
                     curses.resize_term(size[0], size[1])
                     newsize = scr.getmaxyx()
                     scr.erase()
                     for l in self.levels:
                         l.mainsizey += newsize[0]-oldsize[0]
                         l.moveto(l.curx, l.cury, refresh=True)
                     scr.refresh()
                     self.resized = False
                     break # Redisplay
                 if self.mode in self.prompts:
                     if self.prompts[self.mode].handlekey(self, c):
                        break # Redisplay
                 else:
                     # if no key is pressed slow down and beep again
                     if c == -1:
                         self.stepx = 1.
                         self.stepy = 1.
                         self._dobeep = True
                     else:
                         # if a different key was pressed slow down and beep too
                         if c != lastc:
                             lastc = c
                             self.stepx = 1.
                             self.stepy = 1.
                             self._dobeep = True
                         cmdname = self.keymap.get(c, None)
                         if cmdname is None:
                             self.report(
                                 UnassignedKeyError("Unassigned key %s" %
                                                    self.keylabel(c)))
                         else:
                             cmdfunc = getattr(self, "cmd_%s" % cmdname, None)
                             if cmdfunc is None:
                                 self.report(
                                     UnknownCommandError("Unknown command %r" %
                                                         (cmdname,)))
                             elif cmdfunc():
                                 returnvalue = self.returnvalue
                                 self.returnvalue = None
                                 return returnvalue
                         self.stepx = self.nextstepx(self.stepx)
                         self.stepy = self.nextstepy(self.stepy)
                         curses.flushinp() # get rid of type ahead
                         break # Redisplay
         self.scr = None
 
     def display(self):
         if hasattr(curses, "resize_term"):
             oldhandler = signal.signal(signal.SIGWINCH, self.sigwinchhandler)
             try:
                 return curses.wrapper(self._dodisplay)
             finally:
                 signal.signal(signal.SIGWINCH, oldhandler)
         else:
             return curses.wrapper(self._dodisplay)

IPython/Extensions/igrid.py

@@ -1,1126 +1,1126 b''
 # -*- coding: iso-8859-1 -*-
 
 import ipipe, os, webbrowser, urllib
-from IPython import ipapi
+from IPython.core import ipapi
 import wx
 import wx.grid, wx.html
 
 try:
     sorted
 except NameError:
     from ipipe import sorted
 try:
     set
 except:
     from sets import Set as set
 
 
 __all__ = ["igrid"]
 
 
 help = """
 <?xml version='1.0' encoding='iso-8859-1'?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="stylesheet" href="igrid_help.css" type="text/css" />
 <title>igrid help</title>
 </head>
 <body>
 <h1>igrid help</h1>
 
 
 <h2>Commands</h2>
 
 
 <h3>pick (P)</h3>
 <p>Pick the whole row (object is available as "_")</p>
 
 <h3>pickattr (Shift-P)</h3>
 <p>Pick the attribute under the cursor</p>
 
 <h3>pickallattrs (Shift-C)</h3>
 <p>Pick the complete column under the cursor (i.e. the attribute under the
 cursor) from all currently fetched objects. These attributes will be returned
 as a list.</p>
 
 <h3>pickinput (I)</h3>
 <p>Pick the current row as next input line in IPython. Additionally the row is stored as "_"</p>
 
 <h3>pickinputattr (Shift-I)</h3>
 <p>Pick the attribute under the cursor as next input line in IPython. Additionally the row is stored as "_"</p>
 
 <h3>enter (E)</h3>
 <p>Enter the object under the cursor. (what this mean depends on the object
 itself, i.e. how it implements iteration). This opens a new browser 'level'.</p>
 
 <h3>enterattr (Shift-E)</h3>
 <p>Enter the attribute under the cursor.</p>
 
 <h3>detail (D)</h3>
 <p>Show a detail view of the object under the cursor. This shows the name,
 type, doc string and value of the object attributes (and it might show more
 attributes than in the list view, depending on the object).</p>
 
 <h3>detailattr (Shift-D)</h3>
 <p>Show a detail view of the attribute under the cursor.</p>
 
 <h3>pickrows (M)</h3>
 <p>Pick multiple selected rows (M)</p>
 
 <h3>pickrowsattr (CTRL-M)</h3>
 <p>From multiple selected rows pick the cells matching the attribute the cursor is in (CTRL-M)</p>
 
 <h3>find (CTRL-F)</h3>
 <p>Find text</p>
 
 <h3>find_expression (CTRL-Shift-F)</h3>
 <p>Find entries matching an expression</p>
 
 <h3>find_next (F3)</h3>
 <p>Find next occurrence</p>
 
 <h3>find_previous (Shift-F3)</h3>
 <p>Find previous occurrence</p>
 
 <h3>sortattrasc (V)</h3>
 <p>Sort the objects (in ascending order) using the attribute under the cursor as the sort key.</p>
 
 <h3>sortattrdesc (Shift-V)</h3>
 <p>Sort the objects (in descending order) using the attribute under the cursor as the sort key.</p>
 
 <h3>refresh_once (R, F5)</h3>
 <p>Refreshes the display by restarting the iterator</p>
 
 <h3>refresh_every_second</h3>
 <p>Refreshes the display by restarting the iterator every second until stopped by stop_refresh.</p>
 
 <h3>refresh_interval</h3>
 <p>Refreshes the display by restarting the iterator every X ms (X is a custom interval set by the user) until stopped by stop_refresh.</p>
 
 <h3>stop_refresh</h3>
 <p>Stops all refresh timers.</p>
 
 <h3>leave (Backspace, DEL, X)</h3>
 <p>Close current tab (and all the tabs to the right of the current one).</h3>
 
 <h3>quit (ESC,Q)</h3>
 <p>Quit igrid and return to the IPython prompt.</p>
 
 
 <h2>Navigation</h2>
 
 
 <h3>Jump to the last column of the current row (END, CTRL-E, CTRL-Right)</h3>
 
 <h3>Jump to the first column of the current row (HOME, CTRL-A, CTRL-Left)</h3>
 
 <h3>Move the cursor one column to the left (&lt;)</h3>
 
 <h3>Move the cursor one column to the right (&gt;)</h3>
 
 <h3>Jump to the first row in the current column (CTRL-Up)</h3>
 
 <h3>Jump to the last row in the current column (CTRL-Down)</h3>
 
 </body>
 </html>
 
 """
 
 
 class IGridRenderer(wx.grid.PyGridCellRenderer):
     """
     This is a custom renderer for our IGridGrid
     """
     def __init__(self, table):
         self.maxchars = 200
         self.table = table
         self.colormap = (
             (  0,   0,   0),
             (174,   0,   0),
             (  0, 174,   0),
             (174, 174,   0),
             (  0,   0, 174),
             (174,   0, 174),
             (  0, 174, 174),
             ( 64,  64,  64)
         )
 
         wx.grid.PyGridCellRenderer.__init__(self)
 
     def _getvalue(self, row, col):
         try:
             value = self.table._displayattrs[col].value(self.table.items[row])
             (align, width, text) = ipipe.xformat(value, "cell", self.maxchars)
         except Exception, exc:
             (align, width, text) = ipipe.xformat(exc, "cell", self.maxchars)
         return (align, text)
 
     def GetBestSize(self, grid, attr, dc, row, col):
         text = grid.GetCellValue(row, col)
         (align, text) = self._getvalue(row, col)
         dc.SetFont(attr.GetFont())
         (w, h) = dc.GetTextExtent(str(text))
         return wx.Size(min(w+2, 600), h+2) # add border
 
     def Draw(self, grid, attr, dc, rect, row, col, isSelected):
         """
         Takes care of drawing everything in the cell; aligns the text
         """
         text = grid.GetCellValue(row, col)
         (align, text) = self._getvalue(row, col)
         if isSelected:
             bg = grid.GetSelectionBackground()
         else:
             bg = ["white", (240, 240, 240)][row%2]
         dc.SetTextBackground(bg)
         dc.SetBrush(wx.Brush(bg, wx.SOLID))
         dc.SetPen(wx.TRANSPARENT_PEN)
         dc.SetFont(attr.GetFont())
         dc.DrawRectangleRect(rect)
         dc.SetClippingRect(rect)
         # Format the text
         if align == -1: # left alignment
             (width, height) = dc.GetTextExtent(str(text))
             x = rect[0]+1
             y = rect[1]+0.5*(rect[3]-height)
 
             for (style, part) in text:
                 if isSelected:
                     fg = grid.GetSelectionForeground()
                 else:
                     fg = self.colormap[style.fg]
                 dc.SetTextForeground(fg)
                 (w, h) = dc.GetTextExtent(part)
                 dc.DrawText(part, x, y)
                 x += w
         elif align == 0: # center alignment
             (width, height) = dc.GetTextExtent(str(text))
             x = rect[0]+0.5*(rect[2]-width)
             y = rect[1]+0.5*(rect[3]-height)
             for (style, part) in text:
                 if isSelected:
                     fg = grid.GetSelectionForeground()
                 else:
                     fg = self.colormap[style.fg]
                 dc.SetTextForeground(fg)
                 (w, h) = dc.GetTextExtent(part)
                 dc.DrawText(part, x, y)
                 x += w
         else:  # right alignment
             (width, height) = dc.GetTextExtent(str(text))
             x = rect[0]+rect[2]-1
             y = rect[1]+0.5*(rect[3]-height)
             for (style, part) in reversed(text):
                 (w, h) = dc.GetTextExtent(part)
                 x -= w
                 if isSelected:
                     fg = grid.GetSelectionForeground()
                 else:
                     fg = self.colormap[style.fg]
                 dc.SetTextForeground(fg)
                 dc.DrawText(part, x, y)
         dc.DestroyClippingRegion()
 
     def Clone(self):
         return IGridRenderer(self.table)
 
 
 class IGridTable(wx.grid.PyGridTableBase):
     # The data table for the ``IGridGrid``. Some dirty tricks were used here:
     # ``GetValue()`` does not get any values (or at least it does not return
     # anything, accessing the values is done by the renderer)
     # but rather tries to fetch the objects which were requested into the table.
     # General behaviour is: Fetch the first X objects. If the user scrolls down
     # to the last object another bunch of X objects is fetched (if possible)
     def __init__(self, input, fontsize, *attrs):
         wx.grid.PyGridTableBase.__init__(self)
         self.input = input
         self.iterator = ipipe.xiter(input)
         self.items = []
         self.attrs = [ipipe.upgradexattr(attr) for attr in attrs]
         self._displayattrs = self.attrs[:]
         self._displayattrset = set(self.attrs)
         self.fontsize = fontsize
         self._fetch(1)
         self.timer = wx.Timer()
         self.timer.Bind(wx.EVT_TIMER, self.refresh_content)
 
     def GetAttr(self, *args):
         attr = wx.grid.GridCellAttr()
         attr.SetFont(wx.Font(self.fontsize, wx.TELETYPE, wx.NORMAL, wx.NORMAL))
         return attr
 
     def GetNumberRows(self):
         return len(self.items)
 
     def GetNumberCols(self):
         return len(self._displayattrs)
 
     def GetColLabelValue(self, col):
         if col < len(self._displayattrs):
             return self._displayattrs[col].name()
         else:
             return ""
 
     def GetRowLabelValue(self, row):
         return str(row)
 
     def IsEmptyCell(self, row, col):
         return False
 
     def _append(self, item):
         self.items.append(item)
         # Nothing to do if the set of attributes has been fixed by the user
         if not self.attrs:
             for attr in ipipe.xattrs(item):
                 attr = ipipe.upgradexattr(attr)
                 if attr not in self._displayattrset:
                     self._displayattrs.append(attr)
                     self._displayattrset.add(attr)
 
     def _fetch(self, count):
         # Try to fill ``self.items`` with at least ``count`` objects.
         have = len(self.items)
         while self.iterator is not None and have < count:
             try:
                 item = self.iterator.next()
             except StopIteration:
                 self.iterator = None
                 break
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 have += 1
                 self._append(exc)
                 self.iterator = None
                 break
             else:
                 have += 1
                 self._append(item)
 
     def GetValue(self, row, col):
         # some kind of dummy-function: does not return anything but "";
         # (The value isn't use anyway)
         # its main task is to trigger the fetch of new objects
         sizing_needed = False
         had_cols = len(self._displayattrs)
         had_rows = len(self.items)
         if row == had_rows - 1 and self.iterator is not None:
             self._fetch(row + 20)
             sizing_needed = True
         have_rows = len(self.items)
         have_cols = len(self._displayattrs)
         if have_rows > had_rows:
             msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_NOTIFY_ROWS_APPENDED, have_rows - had_rows)
             self.GetView().ProcessTableMessage(msg)
             sizing_needed = True
         if row >= have_rows:
             return ""
         if have_cols != had_cols:
             msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_NOTIFY_COLS_APPENDED, have_cols - had_cols)
             self.GetView().ProcessTableMessage(msg)
             sizing_needed = True
         if sizing_needed:
             self.GetView().AutoSizeColumns(False)
         return ""
 
     def SetValue(self, row, col, value):
         pass
 
     def refresh_content(self, event):
         msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_NOTIFY_ROWS_DELETED, 0, self.GetNumberRows())
         self.GetView().ProcessTableMessage(msg)
         self.iterator = ipipe.xiter(self.input)
         self.items = []
         self.attrs = [] # _append will calculate new displayattrs
         self._fetch(1) # fetch one...
         if self.items:
             msg = wx.grid.GridTableMessage(self, wx.grid.GRIDTABLE_NOTIFY_ROWS_APPENDED, 1)
             self.GetView().ProcessTableMessage(msg)
             self.GetValue(0, 0) # and trigger "fetch next 20"
             item = self.items[0]
             self.GetView().AutoSizeColumns(False)
             panel = self.GetView().GetParent()
             nb = panel.GetParent()
             current = nb.GetSelection()
             if nb.GetPage(current) == panel:
                 self.GetView().set_footer(item)
 
 class IGridGrid(wx.grid.Grid):
     # The actual grid
     # all methods for selecting/sorting/picking/... data are implemented here
     def __init__(self, panel, input, *attrs):
         wx.grid.Grid.__init__(self, panel)
         fontsize = 9
         self.input = input
         self.table = IGridTable(self.input, fontsize, *attrs)
         self.SetTable(self.table, True)
         self.SetSelectionMode(wx.grid.Grid.wxGridSelectRows)
         self.SetDefaultRenderer(IGridRenderer(self.table))
         self.EnableEditing(False)
         self.Bind(wx.EVT_KEY_DOWN, self.key_pressed)
         self.Bind(wx.grid.EVT_GRID_CELL_LEFT_DCLICK, self.cell_doubleclicked)
         self.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.cell_leftclicked)
         self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_DCLICK, self.label_doubleclicked)
         self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_label_leftclick)
         self.Bind(wx.grid.EVT_GRID_RANGE_SELECT, self._on_selected_range)
         self.Bind(wx.grid.EVT_GRID_SELECT_CELL, self._on_selected_cell)
         self.current_selection = set()
         self.maxchars = 200
 
     def on_label_leftclick(self, event):
         event.Skip()
 
     def error_output(self, text):
         wx.Bell()
         frame = self.GetParent().GetParent().GetParent()
         frame.SetStatusText(str(text))
 
     def _on_selected_range(self, event):
         # Internal update to the selection tracking lists
         if event.Selecting():
             # adding to the list...
             self.current_selection.update(xrange(event.GetTopRow(), event.GetBottomRow()+1))
         else:
             # removal from list
             for index in xrange(event.GetTopRow(), event.GetBottomRow()+1):
                 self.current_selection.discard(index)
         event.Skip()
 
     def _on_selected_cell(self, event):
         # Internal update to the selection tracking list
         self.current_selection = set([event.GetRow()])
         event.Skip()
 
     def sort(self, key, reverse=False):
         """
         Sort the current list of items using the key function ``key``. If
         ``reverse`` is true the sort order is reversed.
         """
         row = self.GetGridCursorRow()
         col = self.GetGridCursorCol()
         curitem = self.table.items[row] # Remember where the cursor is now
         # Sort items
         def realkey(item):
             try:
                 return key(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception:
                 return None
         try:
             self.table.items = ipipe.deque(sorted(self.table.items, key=realkey, reverse=reverse))
         except TypeError, exc:
             self.error_output("Exception encountered: %s" % exc)
             return
         # Find out where the object under the cursor went
         for (i, item) in enumerate(self.table.items):
             if item is curitem:
                 self.SetGridCursor(i,col)
                 self.MakeCellVisible(i,col)
                 self.Refresh()
 
     def sortattrasc(self):
         """
         Sort in ascending order; sorting criteria is the current attribute
         """
         col = self.GetGridCursorCol()
         attr = self.table._displayattrs[col]
         frame = self.GetParent().GetParent().GetParent()
         if attr is ipipe.noitem:
             self.error_output("no column under cursor")
             return
         frame.SetStatusText("sort by %s (ascending)" % attr.name())
         def key(item):
             try:
                 return attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception:
                 return None
         self.sort(key)
 
     def sortattrdesc(self):
         """
         Sort in descending order; sorting criteria is the current attribute
         """
         col = self.GetGridCursorCol()
         attr = self.table._displayattrs[col]
         frame = self.GetParent().GetParent().GetParent()
         if attr is ipipe.noitem:
             self.error_output("no column under cursor")
             return
         frame.SetStatusText("sort by %s (descending)" % attr.name())
         def key(item):
             try:
                 return attr.value(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception:
                 return None
         self.sort(key, reverse=True)
 
     def label_doubleclicked(self, event):
         row = event.GetRow()
         col = event.GetCol()
         if col == -1:
             self.enter(row)
 
     def _getvalue(self, row, col):
         """
         Gets the text which is displayed at ``(row, col)``
         """
         try:
             value = self.table._displayattrs[col].value(self.table.items[row])
             (align, width, text) = ipipe.xformat(value, "cell", self.maxchars)
         except IndexError:
             raise IndexError
         except Exception, exc:
             (align, width, text) = ipipe.xformat(exc, "cell", self.maxchars)
         return text
 
     def searchexpression(self, searchexp, startrow=None, search_forward=True ):
         """
         Find by expression
         """
         frame = self.GetParent().GetParent().GetParent()
         if searchexp:
             if search_forward:
                 if not startrow:
                     row = self.GetGridCursorRow()+1
                 else:
                     row = startrow + 1
                 while True:
                     try:
                         foo = self.table.GetValue(row, 0)
                         item = self.table.items[row]
                         try:
                             globals = ipipe.getglobals(None)
                             if eval(searchexp, globals, ipipe.AttrNamespace(item)):
                                 self.SetGridCursor(row, 0) # found something
                                 self.MakeCellVisible(row, 0)
                                 break
                         except (KeyboardInterrupt, SystemExit):
                             raise
                         except Exception, exc:
                             frame.SetStatusText(str(exc))
                             wx.Bell()
                             break  # break on error
                     except IndexError:
                         return
                     row += 1
             else:
                 if not startrow:
                     row = self.GetGridCursorRow() - 1
                 else:
                     row = startrow - 1
                 while True:
                     try:
                         foo = self.table.GetValue(row, 0)
                         item = self.table.items[row]
                         try:
                             globals = ipipe.getglobals(None)
                             if eval(searchexp, globals, ipipe.AttrNamespace(item)):
                                 self.SetGridCursor(row, 0) # found something
                                 self.MakeCellVisible(row, 0)
                                 break
                         except (KeyboardInterrupt, SystemExit):
                             raise
                         except Exception, exc:
                             frame.SetStatusText(str(exc))
                             wx.Bell()
                             break  # break on error
                     except IndexError:
                         return
                     row -= 1
 
 
     def search(self, searchtext, startrow=None, startcol=None, search_forward=True):
         """
         search for ``searchtext``, starting in ``(startrow, startcol)``;
         if ``search_forward`` is true the direction is "forward"
         """
         searchtext = searchtext.lower()
         if search_forward:
             if startrow is not None and startcol is not None:
                 row = startrow
             else:
                 startcol = self.GetGridCursorCol() + 1
                 row = self.GetGridCursorRow()
                 if startcol >= self.GetNumberCols():
                     startcol = 0
                     row += 1
             while True:
                 for col in xrange(startcol, self.table.GetNumberCols()):
                     try:
                         foo = self.table.GetValue(row, col)
                         text = self._getvalue(row, col)
                         if searchtext in text.string().lower():
                             self.SetGridCursor(row, col)
                             self.MakeCellVisible(row, col)
                             return
                     except IndexError:
                         return
                 startcol = 0
                 row += 1
         else:
             if startrow is not None and startcol is not None:
                 row = startrow
             else:
                 startcol = self.GetGridCursorCol() - 1
                 row = self.GetGridCursorRow()
                 if startcol < 0:
                     startcol = self.GetNumberCols() - 1
                     row -= 1
             while True:
                 for col in xrange(startcol, -1, -1):
                     try:
                         foo = self.table.GetValue(row, col)
                         text = self._getvalue(row, col)
                         if searchtext in text.string().lower():
                             self.SetGridCursor(row, col)
                             self.MakeCellVisible(row, col)
                             return
                     except IndexError:
                         return
                 startcol = self.table.GetNumberCols()-1
                 row -= 1
 
     def key_pressed(self, event):
         """
         Maps pressed keys to functions
         """
         frame = self.GetParent().GetParent().GetParent()
         frame.SetStatusText("")
         sh = event.ShiftDown()
         ctrl = event.ControlDown()
 
         keycode = event.GetKeyCode()
         if keycode == ord("P"):
             row = self.GetGridCursorRow()
             if sh:
                 col = self.GetGridCursorCol()
                 self.pickattr(row, col)
             else:
                 self.pick(row)
         elif keycode == ord("M"):
             if ctrl:
                 col = self.GetGridCursorCol()
                 self.pickrowsattr(sorted(self.current_selection), col)
             else:
                 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 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)
         elif keycode == wx.WXK_HOME or (keycode == ord("A") and ctrl):
             row = self.GetGridCursorRow()
             self.SetGridCursor(row, 0)
         elif keycode == ord("C") and sh:
             col = self.GetGridCursorCol()
             attr = self.table._displayattrs[col]
             result = []
             for i in xrange(self.GetNumberRows()):
                 result.append(self.table._displayattrs[col].value(self.table.items[i]))
             self.quit(result)
         elif keycode in (wx.WXK_ESCAPE, ord("Q")) and not (ctrl or sh):
             self.quit()
         elif keycode == ord("<"):
             row = self.GetGridCursorRow()
             col = self.GetGridCursorCol()
             if not event.ShiftDown():
                 newcol = col - 1
                 if newcol >= 0:
                     self.SetGridCursor(row, col - 1)
             else:
                 newcol = col + 1
                 if newcol < self.GetNumberCols():
                     self.SetGridCursor(row, col + 1)
         elif keycode == ord("D"):
             col = self.GetGridCursorCol()
             row = self.GetGridCursorRow()
             if not sh:
                 self.detail(row, col)
             else:
                 self.detail_attr(row, col)
         elif keycode == ord("F") and ctrl:
             if sh:
                 frame.enter_searchexpression(event)
             else:
                 frame.enter_searchtext(event)
         elif keycode == wx.WXK_F3:
             if sh:
                 frame.find_previous(event)
             else:
                 frame.find_next(event)
         elif keycode == ord("V"):
             if sh:
                 self.sortattrdesc()
             else:
                 self.sortattrasc()
         elif keycode == wx.WXK_DOWN:
             row = self.GetGridCursorRow()
             try:
                 item = self.table.items[row+1]
             except IndexError:
                 item = self.table.items[row]
             self.set_footer(item)
             event.Skip()
         elif keycode == wx.WXK_UP:
             row = self.GetGridCursorRow()
             if row >= 1:
                 item = self.table.items[row-1]
             else:
                 item = self.table.items[row]
             self.set_footer(item)
             event.Skip()
         elif keycode == wx.WXK_RIGHT:
             row = self.GetGridCursorRow()
             item = self.table.items[row]
             self.set_footer(item)
             event.Skip()
         elif keycode == wx.WXK_LEFT:
             row = self.GetGridCursorRow()
             item = self.table.items[row]
             self.set_footer(item)
             event.Skip()
         elif keycode == ord("R") or keycode == wx.WXK_F5:
             self.table.refresh_content(event)
         elif keycode == ord("I"):
             row = self.GetGridCursorRow()
             if not sh:
                 self.pickinput(row)
             else:
                 col = self.GetGridCursorCol()
                 self.pickinputattr(row, col)
         else:
             event.Skip()
 
     def delete_current_notebook(self):
         """
         deletes the current notebook tab
         """
         panel = self.GetParent()
         nb = panel.GetParent()
         current = nb.GetSelection()
         count = nb.GetPageCount()
         if count > 1:
             for i in xrange(count-1, current-1, -1):
                 nb.DeletePage(i)
             nb.GetCurrentPage().grid.SetFocus()
         else:
             frame = nb.GetParent()
             frame.SetStatusText("This is the last level!")
 
     def _doenter(self, value, *attrs):
         """
         "enter" a special item resulting in a new notebook tab
         """
         panel = self.GetParent()
         nb = panel.GetParent()
         frame = nb.GetParent()
         current = nb.GetSelection()
         count = nb.GetPageCount()
         try: # if we want to enter something non-iterable, e.g. a function
             if current + 1 == count and value is not self.input: # we have an event in the last tab
                 frame._add_notebook(value, *attrs)
             elif value != self.input: # we have to delete all tabs newer than [panel] first
                 for i in xrange(count-1, current, -1): # some tabs don't close if we don't close in *reverse* order
                     nb.DeletePage(i)
                 frame._add_notebook(value)
         except TypeError, exc:
             if exc.__class__.__module__ == "exceptions":
                 msg = "%s: %s" % (exc.__class__.__name__, exc)
             else:
                 msg = "%s.%s: %s" % (exc.__class__.__module__, exc.__class__.__name__, exc)
             frame.SetStatusText(msg)
 
     def enterattr(self, row, col):
         try:
             attr = self.table._displayattrs[col]
             value = attr.value(self.table.items[row])
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self._doenter(value)
 
     def set_footer(self, item):
         frame = self.GetParent().GetParent().GetParent()
         frame.SetStatusText(" ".join([str(text) for (style, text) in ipipe.xformat(item, "footer", 20)[2]]), 0)
 
     def enter(self, row):
         try:
             value = self.table.items[row]
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self._doenter(value)
 
     def detail(self, row, col):
         """
         shows a detail-view of the current cell
         """
         try:
             attr = self.table._displayattrs[col]
             item = self.table.items[row]
         except Exception, exc:
             self.error_output(str(exc))
         else:
             attrs = [ipipe.AttributeDetail(item, attr) for attr in ipipe.xattrs(item, "detail")]
             self._doenter(attrs)
 
     def detail_attr(self, row, col):
         try:
             attr = self.table._displayattrs[col]
             item = attr.value(self.table.items[row])
         except Exception, exc:
             self.error_output(str(exc))
         else:
             attrs = [ipipe.AttributeDetail(item, attr) for attr in ipipe.xattrs(item, "detail")]
             self._doenter(attrs)
 
     def quit(self, result=None):
         """
         quit
         """
         frame = self.GetParent().GetParent().GetParent()
         if frame.helpdialog:
             frame.helpdialog.Destroy()
         app = frame.parent
         if app is not None:
             app.result = result
         frame.Close()
         frame.Destroy()
 
     def cell_doubleclicked(self, event):
         self.enterattr(event.GetRow(), event.GetCol())
         event.Skip()
 
     def cell_leftclicked(self, event):
         row = event.GetRow()
         item = self.table.items[row]
         self.set_footer(item)
         event.Skip()
 
     def pick(self, row):
         """
         pick a single row and return to the IPython prompt
         """
         try:
             value = self.table.items[row]
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self.quit(value)
 
     def pickinput(self, row):
         try:
             value = self.table.items[row]
         except Exception, exc:
             self.error_output(str(exc))
         else:
             api = ipapi.get()
             api.set_next_input(str(value))
             self.quit(value)
 
     def pickinputattr(self, row, col):
         try:
             attr = self.table._displayattrs[col]
             value = attr.value(self.table.items[row])
         except Exception, exc:
             self.error_output(str(exc))
         else:
             api = ipapi.get()
             api.set_next_input(str(value))
             self.quit(value)
 
     def pickrows(self, rows):
         """
         pick multiple rows and return to the IPython prompt
         """
         try:
             value = [self.table.items[row] for row in rows]
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self.quit(value)
 
     def pickrowsattr(self, rows, col):
         """"
         pick one column from multiple rows
         """
         values = []
         try:
             attr = self.table._displayattrs[col]
             for row in rows:
                 try:
                     values.append(attr.value(self.table.items[row]))
                 except (SystemExit, KeyboardInterrupt):
                     raise
                 except Exception:
                     raise #pass
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self.quit(values)
 
     def pickattr(self, row, col):
         try:
             attr = self.table._displayattrs[col]
             value = attr.value(self.table.items[row])
         except Exception, exc:
             self.error_output(str(exc))
         else:
             self.quit(value)
 
 
 class IGridPanel(wx.Panel):
     # Each IGridPanel contains an IGridGrid
     def __init__(self, parent, input, *attrs):
         wx.Panel.__init__(self, parent, -1)
         self.grid = IGridGrid(self, input, *attrs)
         self.grid.FitInside()
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.grid, proportion=1, flag=wx.EXPAND | wx.ALL, border=10)
         self.SetSizer(sizer)
         sizer.Fit(self)
         sizer.SetSizeHints(self)
 
 
 class IGridHTMLHelp(wx.Frame):
     def __init__(self, parent, title, size):
         wx.Frame.__init__(self, parent, -1, title, size=size)
         html = wx.html.HtmlWindow(self)
         if "gtk2" in wx.PlatformInfo:
             html.SetStandardFonts()
         html.SetPage(help)
 
 
 class IGridFrame(wx.Frame):
     maxtitlelen = 30
 
     def __init__(self, parent, input):
         title =  " ".join([str(text) for (style, text) in ipipe.xformat(input, "header", 20)[2]])
         wx.Frame.__init__(self, None, title=title, size=(640, 480))
         self.menubar = wx.MenuBar()
         self.menucounter = 100
         self.m_help = wx.Menu()
         self.m_search = wx.Menu()
         self.m_sort = wx.Menu()
         self.m_refresh = wx.Menu()
         self.notebook = wx.Notebook(self, -1, style=0)
         self.statusbar = self.CreateStatusBar(1, wx.ST_SIZEGRIP)
         self.statusbar.SetFieldsCount(2)
         self.SetStatusWidths([-1, 200])
         self.parent = parent
         self._add_notebook(input)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
         self.makemenu(self.m_sort, "&Sort (asc)\tV", "Sort ascending", self.sortasc)
         self.makemenu(self.m_sort, "Sort (&desc)\tShift-V", "Sort descending", self.sortdesc)
         self.makemenu(self.m_help, "&Help\tF1", "Help", self.display_help)
 #        self.makemenu(self.m_help, "&Show help in browser", "Show help in browser", self.display_help_in_browser)
         self.makemenu(self.m_search, "&Find text\tCTRL-F", "Find text", self.enter_searchtext)
         self.makemenu(self.m_search, "Find by &expression\tCTRL-Shift-F", "Find by expression", self.enter_searchexpression)
         self.makemenu(self.m_search, "Find &next\tF3", "Find next", self.find_next)
         self.makemenu(self.m_search, "Find &previous\tShift-F3", "Find previous", self.find_previous)
         self.makemenu(self.m_refresh, "&Refresh once \tF5", "Refresh once", self.refresh_once)
         self.makemenu(self.m_refresh, "Refresh every &1s", "Refresh every second", self.refresh_every_second)
         self.makemenu(self.m_refresh, "Refresh every &X seconds", "Refresh every X seconds", self.refresh_interval)
         self.makemenu(self.m_refresh, "&Stop all refresh timers", "Stop refresh timers", self.stop_refresh)
         self.menubar.Append(self.m_search, "&Find")
         self.menubar.Append(self.m_sort, "&Sort")
         self.menubar.Append(self.m_refresh, "&Refresh")
         self.menubar.Append(self.m_help, "&Help")
         self.SetMenuBar(self.menubar)
         self.searchtext = ""
         self.searchexpression = ""
         self.helpdialog = None
         self.refresh_interval = 1000
         self.SetStatusText("Refreshing inactive", 1)
 
     def refresh_once(self, event):
         table = self.notebook.GetPage(self.notebook.GetSelection()).grid.table
         table.refresh_content(event)
 
     def refresh_interval(self, event):
         table = self.notebook.GetPage(self.notebook.GetSelection()).grid.table
         dlg = wx.TextEntryDialog(self, "Enter refresh interval (milliseconds):", "Refresh timer:", defaultValue=str(self.refresh_interval))
         if dlg.ShowModal() == wx.ID_OK:
             try:
                 milliseconds = int(dlg.GetValue())
             except ValueError, exc:
                 self.SetStatusText(str(exc))
             else:
                 table.timer.Start(milliseconds=milliseconds, oneShot=False)
                 self.SetStatusText("Refresh timer set to %s ms" % milliseconds)
                 self.SetStatusText("Refresh interval: %s ms" % milliseconds, 1)
                 self.refresh_interval = milliseconds
         dlg.Destroy()
 
     def stop_refresh(self, event):
         for i in xrange(self.notebook.GetPageCount()):
             nb = self.notebook.GetPage(i)
             nb.grid.table.timer.Stop()
             self.SetStatusText("Refreshing inactive", 1)
 
     def refresh_every_second(self, event):
         table = self.notebook.GetPage(self.notebook.GetSelection()).grid.table
         table.timer.Start(milliseconds=1000, oneShot=False)
         self.SetStatusText("Refresh interval: 1000 ms", 1)
 
     def sortasc(self, event):
         grid = self.notebook.GetPage(self.notebook.GetSelection()).grid
         grid.sortattrasc()
 
     def sortdesc(self, event):
         grid = self.notebook.GetPage(self.notebook.GetSelection()).grid
         grid.sortattrdesc()
 
     def find_previous(self, event):
         """
         find previous occurrences
         """
         grid = self.notebook.GetPage(self.notebook.GetSelection()).grid
         if self.searchtext:
             row = grid.GetGridCursorRow()
             col = grid.GetGridCursorCol()
             self.SetStatusText('Search mode: text; looking for %s' % self.searchtext)
             if col-1 >= 0:
                 grid.search(self.searchtext, row, col-1, False)
             else:
                 grid.search(self.searchtext, row-1, grid.table.GetNumberCols()-1, False)
         elif self.searchexpression:
             self.SetStatusText("Search mode: expression; looking for %s" % repr(self.searchexpression)[2:-1])
             grid.searchexpression(searchexp=self.searchexpression, search_forward=False)
         else:
             self.SetStatusText("No search yet: please enter search-text or -expression")
 
     def find_next(self, event):
         """
         find the next occurrence
         """
         grid = self.notebook.GetPage(self.notebook.GetSelection()).grid
         if self.searchtext != "":
             row = grid.GetGridCursorRow()
             col = grid.GetGridCursorCol()
             self.SetStatusText('Search mode: text; looking for %s' % self.searchtext)
             if col+1 < grid.table.GetNumberCols():
                 grid.search(self.searchtext, row, col+1)
             else:
                 grid.search(self.searchtext, row+1, 0)
         elif self.searchexpression != "":
             self.SetStatusText('Search mode: expression; looking for %s' % repr(self.searchexpression)[2:-1])
             grid.searchexpression(searchexp=self.searchexpression)
         else:
             self.SetStatusText("No search yet: please enter search-text or -expression")
 
     def display_help(self, event):
         """
         Display a help dialog
         """
         if self.helpdialog:
             self.helpdialog.Destroy()
         self.helpdialog = IGridHTMLHelp(None, title="Help", size=wx.Size(600,400))
         self.helpdialog.Show()
 
     def display_help_in_browser(self, event):
         """
         Show the help-HTML in a browser (as a ``HtmlWindow`` does not understand
         CSS this looks better)
         """
         filename = urllib.pathname2url(os.path.abspath(os.path.join(os.path.dirname(__file__), "igrid_help.html")))
         if not filename.startswith("file"):
             filename = "file:" + filename
         webbrowser.open(filename, new=1, autoraise=True)
 
     def enter_searchexpression(self, event):
         dlg = wx.TextEntryDialog(self, "Find:", "Find matching expression:", defaultValue=self.searchexpression)
         if dlg.ShowModal() == wx.ID_OK:
             self.searchexpression = dlg.GetValue()
             self.searchtext = ""
             self.SetStatusText('Search mode: expression; looking for %s' % repr(self.searchexpression)[2:-1])
             self.notebook.GetPage(self.notebook.GetSelection()).grid.searchexpression(self.searchexpression)
         dlg.Destroy()
 
     def makemenu(self, menu, label, help, cmd):
         menu.Append(self.menucounter, label, help)
         self.Bind(wx.EVT_MENU, cmd, id=self.menucounter)
         self.menucounter += 1
 
     def _add_notebook(self, input, *attrs):
         # Adds another notebook which has the starting object ``input``
         panel = IGridPanel(self.notebook, input, *attrs)
         text = str(ipipe.xformat(input, "header", self.maxtitlelen)[2])
         if len(text) >= self.maxtitlelen:
             text = text[:self.maxtitlelen].rstrip(".") + "..."
         self.notebook.AddPage(panel, text, True)
         panel.grid.SetFocus()
         self.Layout()
 
     def OnCloseWindow(self, event):
         self.Destroy()
 
     def enter_searchtext(self, event):
         # Displays a dialog asking for the searchtext
         dlg = wx.TextEntryDialog(self, "Find:", "Find in list", defaultValue=self.searchtext)
         if dlg.ShowModal() == wx.ID_OK:
             self.searchtext = dlg.GetValue()
             self.searchexpression = ""
             self.SetStatusText('Search mode: text; looking for %s' % self.searchtext)
             self.notebook.GetPage(self.notebook.GetSelection()).grid.search(self.searchtext)
         dlg.Destroy()
 
 
 class App(wx.App):
     def __init__(self, input):
         self.input = input
         self.result = None # Result to be returned to IPython. Set by quit().
         wx.App.__init__(self)
 
     def OnInit(self):
         frame = IGridFrame(self, self.input)
         frame.Show()
         self.SetTopWindow(frame)
         frame.Raise()
         return True
 
 
 class igrid(ipipe.Display):
     """
     This is a wx-based display object that can be used instead of ``ibrowse``
     (which is curses-based) or ``idump`` (which simply does a print).
     """
 
     if wx.VERSION < (2, 7):
         def display(self):
             try:
                 # 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.
                 frame = IGridFrame(None, self.input)
                 frame.Show()
                 frame.Raise()
             except wx.PyNoAppError:
                 # There's no wx application yet => create one.
                 app = App(self.input)
                 app.MainLoop()
                 return app.result
     else:
         # With wx 2.7 it gets simpler.
         def display(self):
             app = App(self.input)
             app.MainLoop()
             return app.result
 

IPython/Extensions/ipipe.py

@@ -1,2328 +1,2328 b''
 # -*- coding: iso-8859-1 -*-
 
 """
 ``ipipe`` provides classes to be used in an interactive Python session. Doing a
 ``from ipipe import *`` is the preferred way to do this. The name of all
 objects imported this way starts with ``i`` to minimize collisions.
 
 ``ipipe`` supports "pipeline expressions", which is something resembling Unix
 pipes. An example is::
 
     >>> ienv | isort("key.lower()")
 
 This gives a listing of all environment variables sorted by name.
 
 
 There are three types of objects in a pipeline expression:
 
 * ``Table``s: These objects produce items. Examples are ``ils`` (listing the
   current directory, ``ienv`` (listing environment variables), ``ipwd`` (listing
   user accounts) and ``igrp`` (listing user groups). A ``Table`` must be the
   first object in a pipe expression.
 
 * ``Pipe``s: These objects sit in the middle of a pipe expression. They
   transform the input in some way (e.g. filtering or sorting it). Examples are:
   ``ifilter`` (which filters the input pipe), ``isort`` (which sorts the input
   pipe) and ``ieval`` (which evaluates a function or expression for each object
   in the input pipe).
 
 * ``Display``s: These objects can be put as the last object in a pipeline
   expression. There are responsible for displaying the result of the pipeline
   expression. If a pipeline expression doesn't end in a display object a default
   display objects will be used. One example is ``ibrowse`` which is a ``curses``
   based browser.
 
 
 Adding support for pipeline expressions to your own objects can be done through
 three extensions points (all of them optional):
 
 * An object that will be displayed as a row by a ``Display`` object should
   implement the method ``__xattrs__(self, mode)`` method or register an
   implementation of the generic function ``xattrs``. For more info see ``xattrs``.
 
 * When an object ``foo`` is displayed by a ``Display`` object, the generic
   function ``xrepr`` is used.
 
 * Objects that can be iterated by ``Pipe``s must iterable. For special cases,
   where iteration for display is different than the normal iteration a special
   implementation can be registered with the generic function ``xiter``. This
   makes it possible to use dictionaries and modules in pipeline expressions,
   for example::
 
       >>> import sys
       >>> sys | ifilter("isinstance(value, int)") | idump
       key        |value
       api_version|      1012
       dllhandle  | 503316480
       hexversion |  33817328
       maxint     |2147483647
       maxunicode |     65535
       >>> sys.modules | ifilter("_.value is not None") | isort("_.key.lower()")
       ...
 
   Note: The expression strings passed to ``ifilter()`` and ``isort()`` can
   refer to the object to be filtered or sorted via the variable ``_`` and to any
   of the attributes of the object, i.e.::
 
       >>> sys.modules | ifilter("_.value is not None") | isort("_.key.lower()")
 
   does the same as::
 
       >>> sys.modules | ifilter("value is not None") | isort("key.lower()")
 
   In addition to expression strings, it's possible to pass callables (taking
   the object as an argument) to ``ifilter()``, ``isort()`` and ``ieval()``::
 
       >>> sys | ifilter(lambda _:isinstance(_.value, int)) \
       ...     | ieval(lambda _: (_.key, hex(_.value))) | idump
       0          |1
       api_version|0x3f4
       dllhandle  |0x1e000000
       hexversion |0x20402f0
       maxint     |0x7fffffff
       maxunicode |0xffff
 """
 
 skip_doctest = True  # ignore top-level docstring as a doctest.
 
 import sys, os, os.path, stat, glob, new, csv, datetime, types
 import itertools, mimetypes, StringIO
 
 try: # Python 2.3 compatibility
     import collections
 except ImportError:
     deque = list
 else:
     deque = collections.deque
 
 try: # Python 2.3 compatibility
     set
 except NameError:
     import sets
     set = sets.Set
 
 try: # Python 2.3 compatibility
     sorted
 except NameError:
     def sorted(iterator, key=None, reverse=False):
         items = list(iterator)
         if key is not None:
             items.sort(lambda i1, i2: cmp(key(i1), key(i2)))
         else:
             items.sort()
         if reverse:
             items.reverse()
         return items
 
 try: # Python 2.4 compatibility
     GeneratorExit
 except NameError:
     GeneratorExit = SystemExit
 
 try:
     import pwd
 except ImportError:
     pwd = None
 
 try:
     import grp
 except ImportError:
     grp = None
 
 from IPython.external import simplegeneric
 from IPython.external import path
 
 try:
     from IPython.utils import genutils
     from IPython.utils import generics
 except ImportError:
     genutils = None
     generics = None
 
-from IPython import ipapi
+from IPython.core import ipapi
 
 
 __all__ = [
     "ifile", "ils", "iglob", "iwalk", "ipwdentry", "ipwd", "igrpentry", "igrp",
     "icsv", "ix", "ichain", "isort", "ifilter", "ieval", "ienum",
     "ienv", "ihist", "ialias", "icap", "idump", "iless"
 ]
 
 
 os.stat_float_times(True) # enable microseconds
 
 
 class AttrNamespace(object):
     """
     Helper class that is used for providing a namespace for evaluating
     expressions containing attribute names of an object.
     """
     def __init__(self, wrapped):
         self.wrapped = wrapped
 
     def __getitem__(self, name):
         if name == "_":
             return self.wrapped
         try:
             return getattr(self.wrapped, name)
         except AttributeError:
             raise KeyError(name)
 
 # Python 2.3 compatibility
 # use eval workaround to find out which names are used in the
 # eval string and put them into the locals. This works for most
 # normal uses case, bizarre ones like accessing the locals()
 # will fail
 try:
     eval("_", None, AttrNamespace(None))
 except TypeError:
     real_eval = eval
     def eval(codestring, _globals, _locals):
         """
         eval(source[, globals[, locals]]) -> value
 
         Evaluate the source in the context of globals and locals.
         The source may be a string representing a Python expression
         or a code object as returned by compile().
         The globals must be a dictionary and locals can be any mappping.
 
         This function is a workaround for the shortcomings of
         Python 2.3's eval.
         """
 
         if isinstance(codestring, basestring):
             code = compile(codestring, "_eval", "eval")
         else:
             code = codestring
         newlocals = {}
         for name in code.co_names:
             try:
                 newlocals[name] = _locals[name]
             except KeyError:
                 pass
         return real_eval(code, _globals, newlocals)
 
 
 noitem = object()
 
 
 def item(iterator, index, default=noitem):
     """
     Return the ``index``th item from the iterator ``iterator``.
     ``index`` must be an integer (negative integers are relative to the
     end (i.e. the last items produced by the iterator)).
 
     If ``default`` is given, this will be the default value when
     the iterator doesn't contain an item at this position. Otherwise an
     ``IndexError`` will be raised.
 
     Note that using this function will partially or totally exhaust the
     iterator.
     """
     i = index
     if i>=0:
         for item in iterator:
             if not i:
                 return item
             i -= 1
     else:
         i = -index
         cache = deque()
         for item in iterator:
             cache.append(item)
             if len(cache)>i:
                 cache.popleft()
         if len(cache)==i:
             return cache.popleft()
     if default is noitem:
         raise IndexError(index)
     else:
         return default
 
 
 def getglobals(g):
     """
     Return the global namespace that is used for expression strings in
     ``ifilter`` and others. This is ``g`` or (if ``g`` is ``None``) IPython's
     user namespace.
     """
     if g is None:
         if ipapi is not None:
             api = ipapi.get()
             if api is not None:
                 return api.user_ns
         return globals()
     return g
 
 
 class Descriptor(object):
     """
     A ``Descriptor`` object is used for describing the attributes of objects.
     """
     def __hash__(self):
         return hash(self.__class__) ^ hash(self.key())
 
     def __eq__(self, other):
         return self.__class__ is other.__class__ and self.key() == other.key()
 
     def __ne__(self, other):
         return self.__class__ is not other.__class__ or self.key() != other.key()
 
     def key(self):
         pass
 
     def name(self):
         """
         Return the name of this attribute for display by a ``Display`` object
         (e.g. as a column title).
         """
         key = self.key()
         if key is None:
             return "_"
         return str(key)
 
     def attrtype(self, obj):
         """
         Return the type of this attribute (i.e. something like "attribute" or
         "method").
         """
 
     def valuetype(self, obj):
         """
         Return the type of this attribute value of the object ``obj``.
         """
 
     def value(self, obj):
         """
         Return the value of this attribute of the object ``obj``.
         """
 
     def doc(self, obj):
         """
         Return the documentation for this attribute.
         """
 
     def shortdoc(self, obj):
         """
         Return a short documentation for this attribute (defaulting to the
         first line).
         """
         doc = self.doc(obj)
         if doc is not None:
             doc = doc.strip().splitlines()[0].strip()
         return doc
 
     def iter(self, obj):
         """
         Return an iterator for this attribute of the object ``obj``.
         """
         return xiter(self.value(obj))
 
 
 class SelfDescriptor(Descriptor):
     """
     A ``SelfDescriptor`` describes the object itself.
     """
     def key(self):
         return None
 
     def attrtype(self, obj):
         return "self"
 
     def valuetype(self, obj):
         return type(obj)
 
     def value(self, obj):
         return obj
 
     def __repr__(self):
         return "Self"
 
 selfdescriptor = SelfDescriptor() # there's no need for more than one
 
 
 class AttributeDescriptor(Descriptor):
     """
     An ``AttributeDescriptor`` describes a simple attribute of an object.
     """
     __slots__ = ("_name", "_doc")
 
     def __init__(self, name, doc=None):
         self._name = name
         self._doc = doc
 
     def key(self):
         return self._name
 
     def doc(self, obj):
         return self._doc
 
     def attrtype(self, obj):
         return "attr"
 
     def valuetype(self, obj):
         return type(getattr(obj, self._name))
 
     def value(self, obj):
         return getattr(obj, self._name)
 
     def __repr__(self):
         if self._doc is None:
             return "Attribute(%r)" % self._name
         else:
             return "Attribute(%r, %r)" % (self._name, self._doc)
 
 
 class IndexDescriptor(Descriptor):
     """
     An ``IndexDescriptor`` describes an "attribute" of an object that is fetched
     via ``__getitem__``.
     """
     __slots__ = ("_index",)
 
     def __init__(self, index):
         self._index = index
 
     def key(self):
         return self._index
 
     def attrtype(self, obj):
         return "item"
 
     def valuetype(self, obj):
         return type(obj[self._index])
 
     def value(self, obj):
         return obj[self._index]
 
     def __repr__(self):
         return "Index(%r)" % self._index
 
 
 class MethodDescriptor(Descriptor):
     """
     A ``MethodDescriptor`` describes a method of an object that can be called
     without argument. Note that this method shouldn't change the object.
     """
     __slots__ = ("_name", "_doc")
 
     def __init__(self, name, doc=None):
         self._name = name
         self._doc = doc
 
     def key(self):
         return self._name
 
     def doc(self, obj):
         if self._doc is None:
             return getattr(obj, self._name).__doc__
         return self._doc
 
     def attrtype(self, obj):
         return "method"
 
     def valuetype(self, obj):
         return type(self.value(obj))
 
     def value(self, obj):
         return getattr(obj, self._name)()
 
     def __repr__(self):
         if self._doc is None:
             return "Method(%r)" % self._name
         else:
             return "Method(%r, %r)" % (self._name, self._doc)
 
 
 class IterAttributeDescriptor(Descriptor):
     """
     An ``IterAttributeDescriptor`` works like an ``AttributeDescriptor`` but
     doesn't return an attribute values (because this value might be e.g. a large
     list).
     """
     __slots__ = ("_name", "_doc")
 
     def __init__(self, name, doc=None):
         self._name = name
         self._doc = doc
 
     def key(self):
         return self._name
 
     def doc(self, obj):
         return self._doc
 
     def attrtype(self, obj):
         return "iter"
 
     def valuetype(self, obj):
         return noitem
 
     def value(self, obj):
         return noitem
 
     def iter(self, obj):
         return xiter(getattr(obj, self._name))
 
     def __repr__(self):
         if self._doc is None:
             return "IterAttribute(%r)" % self._name
         else:
             return "IterAttribute(%r, %r)" % (self._name, self._doc)
 
 
 class IterMethodDescriptor(Descriptor):
     """
     An ``IterMethodDescriptor`` works like an ``MethodDescriptor`` but doesn't
     return an attribute values (because this value might be e.g. a large list).
     """
     __slots__ = ("_name", "_doc")
 
     def __init__(self, name, doc=None):
         self._name = name
         self._doc = doc
 
     def key(self):
         return self._name
 
     def doc(self, obj):
         if self._doc is None:
             return getattr(obj, self._name).__doc__
         return self._doc
 
     def attrtype(self, obj):
         return "itermethod"
 
     def valuetype(self, obj):
         return noitem
 
     def value(self, obj):
         return noitem
 
     def iter(self, obj):
         return xiter(getattr(obj, self._name)())
 
     def __repr__(self):
         if self._doc is None:
             return "IterMethod(%r)" % self._name
         else:
             return "IterMethod(%r, %r)" % (self._name, self._doc)
 
 
 class FunctionDescriptor(Descriptor):
     """
     A ``FunctionDescriptor`` turns a function into a descriptor. The function
     will be called with the object to get the type and value of the attribute.
     """
     __slots__ = ("_function", "_name", "_doc")
 
     def __init__(self, function, name=None, doc=None):
         self._function = function
         self._name = name
         self._doc = doc
 
     def key(self):
         return self._function
 
     def name(self):
         if self._name is not None:
             return self._name
         return getattr(self._function, "__xname__", self._function.__name__)
 
     def doc(self, obj):
         if self._doc is None:
             return self._function.__doc__
         return self._doc
 
     def attrtype(self, obj):
         return "function"
 
     def valuetype(self, obj):
         return type(self._function(obj))
 
     def value(self, obj):
         return self._function(obj)
 
     def __repr__(self):
         if self._doc is None:
             return "Function(%r)" % self._name
         else:
             return "Function(%r, %r)" % (self._name, self._doc)
 
 
 class Table(object):
     """
     A ``Table`` is an object that produces items (just like a normal Python
     iterator/generator does) and can be used as the first object in a pipeline
     expression. The displayhook will open the default browser for such an object
     (instead of simply printing the ``repr()`` result).
     """
 
     # We want to support ``foo`` and ``foo()`` in pipeline expression:
     # So we implement the required operators (``|`` and ``+``) in the metaclass,
     # instantiate the class and forward the operator to the instance
     class __metaclass__(type):
         def __iter__(self):
             return iter(self())
 
         def __or__(self, other):
             return self() | other
 
         def __add__(self, other):
             return self() + other
 
         def __radd__(self, other):
             return other + self()
 
         def __getitem__(self, index):
             return self()[index]
 
     def __getitem__(self, index):
         return item(self, index)
 
     def __contains__(self, item):
         for haveitem in self:
             if item == haveitem:
                 return True
         return False
 
     def __or__(self, other):
         # autoinstantiate right hand side
         if isinstance(other, type) and issubclass(other, (Table, Display)):
             other = other()
         # treat simple strings and functions as ``ieval`` instances
         elif not isinstance(other, Display) and not isinstance(other, Table):
             other = ieval(other)
         # forward operations to the right hand side
         return other.__ror__(self)
 
     def __add__(self, other):
         # autoinstantiate right hand side
         if isinstance(other, type) and issubclass(other, Table):
             other = other()
         return ichain(self, other)
 
     def __radd__(self, other):
         # autoinstantiate left hand side
         if isinstance(other, type) and issubclass(other, Table):
             other = other()
         return ichain(other, self)
 
 
 class Pipe(Table):
     """
     A ``Pipe`` is an object that can be used in a pipeline expression. It
     processes the objects it gets from its input ``Table``/``Pipe``. Note that
     a ``Pipe`` object can't be used as the first object in a pipeline
     expression, as it doesn't produces items itself.
     """
     class __metaclass__(Table.__metaclass__):
         def __ror__(self, input):
             return input | self()
 
     def __ror__(self, input):
         # autoinstantiate left hand side
         if isinstance(input, type) and issubclass(input, Table):
             input = input()
         self.input = input
         return self
 
 
 def xrepr(item, mode="default"):
     """
     Generic function that adds color output and different display modes to ``repr``.
 
     The result of an ``xrepr`` call is iterable and consists of ``(style, string)``
     tuples. The ``style`` in this tuple must be a ``Style`` object from the
     ``astring`` module. To reconfigure the output the first yielded tuple can be
     a ``(aligment, full)`` tuple instead of a ``(style, string)`` tuple.
     ``alignment``  can be -1 for left aligned, 0 for centered and 1 for right
     aligned (the default is left alignment). ``full`` is a boolean that specifies
     whether the complete output must be displayed or the ``Display`` object is
     allowed to stop output after enough text has been produced (e.g. a syntax
     highlighted text line would use ``True``, but for a large data structure
     (i.e. a nested list, tuple or dictionary) ``False`` would be used).
     The default is full output.
 
     There are four different possible values for ``mode`` depending on where
     the ``Display`` object will display ``item``:
 
     ``"header"``
         ``item`` will be displayed in a header line (this is used by ``ibrowse``).
 
     ``"footer"``
         ``item`` will be displayed in a footer line (this is used by ``ibrowse``).
 
     ``"cell"``
         ``item`` will be displayed in a table cell/list.
 
     ``"default"``
         default mode. If an ``xrepr`` implementation recursively outputs objects,
         ``"default"`` must be passed in the recursive calls to ``xrepr``.
 
     If no implementation is registered for ``item``, ``xrepr`` will try the
     ``__xrepr__`` method on ``item``. If ``item`` doesn't have an ``__xrepr__``
     method it falls back to ``repr``/``__repr__`` for all modes.
     """
     try:
         func = item.__xrepr__
     except AttributeError:
         yield (astyle.style_default, repr(item))
     else:
         try:
             for x in func(mode):
                 yield x
         except (KeyboardInterrupt, SystemExit, GeneratorExit):
             raise
         except Exception:
             yield (astyle.style_default, repr(item))
 xrepr = simplegeneric.generic(xrepr)
 
 
 def xrepr_none(self, mode="default"):
     yield (astyle.style_type_none, repr(self))
 xrepr.when_object(None)(xrepr_none)
 
 
 def xrepr_noitem(self, mode="default"):
     yield (2, True)
     yield (astyle.style_nodata, "<?>")
 xrepr.when_object(noitem)(xrepr_noitem)
 
 
 def xrepr_bool(self, mode="default"):
     yield (astyle.style_type_bool, repr(self))
 xrepr.when_type(bool)(xrepr_bool)
 
 
 def xrepr_str(self, mode="default"):
     if mode == "cell":
         yield (astyle.style_default, repr(self.expandtabs(tab))[1:-1])
     else:
         yield (astyle.style_default, repr(self))
 xrepr.when_type(str)(xrepr_str)
 
 
 def xrepr_unicode(self, mode="default"):
     if mode == "cell":
         yield (astyle.style_default, repr(self.expandtabs(tab))[2:-1])
     else:
         yield (astyle.style_default, repr(self))
 xrepr.when_type(unicode)(xrepr_unicode)
 
 
 def xrepr_number(self, mode="default"):
     yield (1, True)
     yield (astyle.style_type_number, repr(self))
 xrepr.when_type(int)(xrepr_number)
 xrepr.when_type(long)(xrepr_number)
 xrepr.when_type(float)(xrepr_number)
 
 
 def xrepr_complex(self, mode="default"):
     yield (astyle.style_type_number, repr(self))
 xrepr.when_type(complex)(xrepr_number)
 
 
 def xrepr_datetime(self, mode="default"):
     if mode == "cell":
         # Don't use strftime() here, as this requires year >= 1900
         yield (astyle.style_type_datetime,
                "%04d-%02d-%02d %02d:%02d:%02d.%06d" % \
                     (self.year, self.month, self.day,
                      self.hour, self.minute, self.second,
                      self.microsecond),
                 )
     else:
         yield (astyle.style_type_datetime, repr(self))
 xrepr.when_type(datetime.datetime)(xrepr_datetime)
 
 
 def xrepr_date(self, mode="default"):
     if mode == "cell":
         yield (astyle.style_type_datetime,
                "%04d-%02d-%02d" % (self.year, self.month, self.day))
     else:
         yield (astyle.style_type_datetime, repr(self))
 xrepr.when_type(datetime.date)(xrepr_date)
 
 
 def xrepr_time(self, mode="default"):
     if mode == "cell":
         yield (astyle.style_type_datetime,
                 "%02d:%02d:%02d.%06d" % \
                     (self.hour, self.minute, self.second, self.microsecond))
     else:
         yield (astyle.style_type_datetime, repr(self))
 xrepr.when_type(datetime.time)(xrepr_time)
 
 
 def xrepr_timedelta(self, mode="default"):
     yield (astyle.style_type_datetime, repr(self))
 xrepr.when_type(datetime.timedelta)(xrepr_timedelta)
 
 
 def xrepr_type(self, mode="default"):
     if self.__module__ == "__builtin__":
         yield (astyle.style_type_type, self.__name__)
     else:
         yield (astyle.style_type_type, "%s.%s" % (self.__module__, self.__name__))
 xrepr.when_type(type)(xrepr_type)
 
 
 def xrepr_exception(self, mode="default"):
     if self.__class__.__module__ == "exceptions":
         classname = self.__class__.__name__
     else:
         classname = "%s.%s" % \
             (self.__class__.__module__, self.__class__.__name__)
     if mode == "header" or mode == "footer":
         yield (astyle.style_error, "%s: %s" % (classname, self))
     else:
         yield (astyle.style_error, classname)
 xrepr.when_type(Exception)(xrepr_exception)
 
 
 def xrepr_listtuple(self, mode="default"):
     if mode == "header" or mode == "footer":
         if self.__class__.__module__ == "__builtin__":
             classname = self.__class__.__name__
         else:
             classname = "%s.%s" % \
                 (self.__class__.__module__,self.__class__.__name__)
         yield (astyle.style_default,
                "<%s object with %d items at 0x%x>" % \
                    (classname, len(self), id(self)))
     else:
         yield (-1, False)
         if isinstance(self, list):
             yield (astyle.style_default, "[")
             end = "]"
         else:
             yield (astyle.style_default, "(")
             end = ")"
         for (i, subself) in enumerate(self):
             if i:
                 yield (astyle.style_default, ", ")
             for part in xrepr(subself, "default"):
                 yield part
         yield (astyle.style_default, end)
 xrepr.when_type(list)(xrepr_listtuple)
 xrepr.when_type(tuple)(xrepr_listtuple)
 
 
 def xrepr_dict(self, mode="default"):
     if mode == "header" or mode == "footer":
         if self.__class__.__module__ == "__builtin__":
             classname = self.__class__.__name__
         else:
             classname = "%s.%s" % \
                 (self.__class__.__module__,self.__class__.__name__)
         yield (astyle.style_default,
                "<%s object with %d items at 0x%x>" % \
                 (classname, len(self), id(self)))
     else:
         yield (-1, False)
         if isinstance(self, dict):
             yield (astyle.style_default, "{")
             end = "}"
         else:
             yield (astyle.style_default, "dictproxy((")
             end = "})"
         for (i, (key, value)) in enumerate(self.iteritems()):
             if i:
                 yield (astyle.style_default, ", ")
             for part in xrepr(key, "default"):
                 yield part
             yield (astyle.style_default, ": ")
             for part in xrepr(value, "default"):
                 yield part
         yield (astyle.style_default, end)
 xrepr.when_type(dict)(xrepr_dict)
 xrepr.when_type(types.DictProxyType)(xrepr_dict)
 
 
 def upgradexattr(attr):
     """
     Convert an attribute descriptor string to a real descriptor object.
 
     If attr already is a descriptor object return it unmodified. A
     ``SelfDescriptor`` will be returned if ``attr`` is ``None``. ``"foo"``
     returns an ``AttributeDescriptor`` for the attribute named ``"foo"``.
     ``"foo()"`` returns a ``MethodDescriptor`` for the method named ``"foo"``.
     ``"-foo"`` will return an ``IterAttributeDescriptor`` for the attribute
     named ``"foo"`` and ``"-foo()"`` will return an ``IterMethodDescriptor``
     for the method named ``"foo"``. Furthermore integers will return the appropriate
     ``IndexDescriptor`` and callables will return a ``FunctionDescriptor``.
     """
     if attr is None:
         return selfdescriptor
     elif isinstance(attr, Descriptor):
         return attr
     elif isinstance(attr, basestring):
         if attr.endswith("()"):
             if attr.startswith("-"):
                 return IterMethodDescriptor(attr[1:-2])
             else:
                 return MethodDescriptor(attr[:-2])
         else:
             if attr.startswith("-"):
                 return IterAttributeDescriptor(attr[1:])
             else:
                 return AttributeDescriptor(attr)
     elif isinstance(attr, (int, long)):
         return IndexDescriptor(attr)
     elif callable(attr):
         return FunctionDescriptor(attr)
     else:
         raise TypeError("can't handle descriptor %r" % attr)
 
 
 def xattrs(item, mode="default"):
     """
     Generic function that returns an iterable of attribute descriptors
     to be used for displaying the attributes ob the object ``item`` in display
     mode ``mode``.
 
     There are two possible modes:
 
     ``"detail"``
         The ``Display`` object wants to display a detailed list of the object
         attributes.
 
     ``"default"``
         The ``Display`` object wants to display the object in a list view.
 
     If no implementation is registered for the object ``item`` ``xattrs`` falls
     back to trying the ``__xattrs__`` method of the object. If this doesn't
     exist either, ``dir(item)`` is used for ``"detail"`` mode and ``(None,)``
     for ``"default"`` mode.
 
     The implementation must yield attribute descriptors (see the class
     ``Descriptor`` for more info). The ``__xattrs__`` method may also return
     attribute descriptor strings (and ``None``) which will be converted to real
     descriptors by ``upgradexattr()``.
     """
     try:
         func = item.__xattrs__
     except AttributeError:
         if mode == "detail":
             for attrname in dir(item):
                 yield AttributeDescriptor(attrname)
         else:
             yield selfdescriptor
     else:
         for attr in func(mode):
             yield upgradexattr(attr)
 xattrs = simplegeneric.generic(xattrs)
 
 
 def xattrs_complex(self, mode="default"):
     if mode == "detail":
         return (AttributeDescriptor("real"), AttributeDescriptor("imag"))
     return (selfdescriptor,)
 xattrs.when_type(complex)(xattrs_complex)
 
 
 def _isdict(item):
     try:
         itermeth = item.__class__.__iter__
     except (AttributeError, TypeError):
         return False
     return itermeth is dict.__iter__ or itermeth is types.DictProxyType.__iter__
 
 
 def _isstr(item):
     if not isinstance(item, basestring):
         return False
     try:
         itermeth = item.__class__.__iter__
     except AttributeError:
         return True
     return False # ``__iter__`` has been redefined
 
 
 def xiter(item):
     """
     Generic function that implements iteration for pipeline expression. If no
     implementation is registered for ``item`` ``xiter`` falls back to ``iter``.
     """
     try:
         func = item.__xiter__
     except AttributeError:
         if _isdict(item):
             def items(item):
                 fields = ("key", "value")
                 for (key, value) in item.iteritems():
                     yield Fields(fields, key=key, value=value)
             return items(item)
         elif isinstance(item, new.module):
             def items(item):
                 fields = ("key", "value")
                 for key in sorted(item.__dict__):
                     yield Fields(fields, key=key, value=getattr(item, key))
             return items(item)
         elif _isstr(item):
             if not item:
                 raise ValueError("can't enter empty string")
             lines = item.splitlines()
             if len(lines) == 1:
                def iterone(item):
                    yield item
                return iterone(item)
             else:
                 return iter(lines)
         return iter(item)
     else:
         return iter(func()) # iter() just to be safe
 xiter = simplegeneric.generic(xiter)
 
 
 class ichain(Pipe):
     """
     Chains multiple ``Table``s into one.
     """
 
     def __init__(self, *iters):
         self.iters = iters
 
     def __iter__(self):
         return itertools.chain(*self.iters)
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             for (i, item) in enumerate(self.iters):
                 if i:
                     yield (astyle.style_default, "+")
                 if isinstance(item, Pipe):
                     yield (astyle.style_default, "(")
                 for part in xrepr(item, mode):
                     yield part
                 if isinstance(item, Pipe):
                     yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         args = ", ".join([repr(it) for it in self.iters])
         return "%s.%s(%s)" % \
             (self.__class__.__module__, self.__class__.__name__, args)
 
 
 class ifile(path.path):
     """
     file (or directory) object.
     """
 
     def getmode(self):
         return self.stat().st_mode
     mode = property(getmode, None, None, "Access mode")
 
     def gettype(self):
         data = [
             (stat.S_ISREG, "file"),
             (stat.S_ISDIR, "dir"),
             (stat.S_ISCHR, "chardev"),
             (stat.S_ISBLK, "blockdev"),
             (stat.S_ISFIFO, "fifo"),
             (stat.S_ISLNK, "symlink"),
             (stat.S_ISSOCK,"socket"),
         ]
         lstat = self.lstat()
         if lstat is not None:
             types = set([text for (func, text) in data if func(lstat.st_mode)])
         else:
             types = set()
         m = self.mode
         types.update([text for (func, text) in data if func(m)])
         return ", ".join(types)
     type = property(gettype, None, None, "file type (file, directory, link, etc.)")
 
     def getmodestr(self):
         m = self.mode
         data = [
             (stat.S_IRUSR, "-r"),
             (stat.S_IWUSR, "-w"),
             (stat.S_IXUSR, "-x"),
             (stat.S_IRGRP, "-r"),
             (stat.S_IWGRP, "-w"),
             (stat.S_IXGRP, "-x"),
             (stat.S_IROTH, "-r"),
             (stat.S_IWOTH, "-w"),
             (stat.S_IXOTH, "-x"),
         ]
         return "".join([text[bool(m&bit)] for (bit, text) in data])
 
     modestr = property(getmodestr, None, None, "Access mode as string")
 
     def getblocks(self):
         return self.stat().st_blocks
     blocks = property(getblocks, None, None, "File size in blocks")
 
     def getblksize(self):
         return self.stat().st_blksize
     blksize = property(getblksize, None, None, "Filesystem block size")
 
     def getdev(self):
         return self.stat().st_dev
     dev = property(getdev)
 
     def getnlink(self):
         return self.stat().st_nlink
     nlink = property(getnlink, None, None, "Number of links")
 
     def getuid(self):
         return self.stat().st_uid
     uid = property(getuid, None, None, "User id of file owner")
 
     def getgid(self):
         return self.stat().st_gid
     gid = property(getgid, None, None, "Group id of file owner")
 
     def getowner(self):
         stat = self.stat()
         try:
             return pwd.getpwuid(stat.st_uid).pw_name
         except KeyError:
             return stat.st_uid
     owner = property(getowner, None, None, "Owner name (or id)")
 
     def getgroup(self):
         stat = self.stat()
         try:
             return grp.getgrgid(stat.st_gid).gr_name
         except KeyError:
             return stat.st_gid
     group = property(getgroup, None, None, "Group name (or id)")
 
     def getadate(self):
         return datetime.datetime.utcfromtimestamp(self.atime)
     adate = property(getadate, None, None, "Access date")
 
     def getcdate(self):
         return datetime.datetime.utcfromtimestamp(self.ctime)
     cdate = property(getcdate, None, None, "Creation date")
 
     def getmdate(self):
         return datetime.datetime.utcfromtimestamp(self.mtime)
     mdate = property(getmdate, None, None, "Modification date")
 
     def mimetype(self):
         """
         Return MIME type guessed from the extension.
         """
         return mimetypes.guess_type(self.basename())[0]
 
     def encoding(self):
         """
         Return guessed compression (like "compress" or "gzip").
         """
         return mimetypes.guess_type(self.basename())[1]
 
     def __repr__(self):
         return "ifile(%s)" % path._base.__repr__(self)
 
     if sys.platform == "win32":
         defaultattrs = (None, "type", "size", "modestr", "mdate")
     else:
         defaultattrs = (None, "type", "size", "modestr", "owner", "group", "mdate")
 
     def __xattrs__(self, mode="default"):
         if mode == "detail":
             return (
                 "name",
                 "basename()",
                 "abspath()",
                 "realpath()",
                 "type",
                 "mode",
                 "modestr",
                 "stat()",
                 "lstat()",
                 "uid",
                 "gid",
                 "owner",
                 "group",
                 "dev",
                 "nlink",
                 "ctime",
                 "mtime",
                 "atime",
                 "cdate",
                 "mdate",
                 "adate",
                 "size",
                 "blocks",
                 "blksize",
                 "isdir()",
                 "islink()",
                 "mimetype()",
                 "encoding()",
                 "-listdir()",
                 "-dirs()",
                 "-files()",
                 "-walk()",
                 "-walkdirs()",
                 "-walkfiles()",
             )
         else:
             return self.defaultattrs
 
 
 def xiter_ifile(self):
     if self.isdir():
         yield (self / os.pardir).abspath()
         for child in sorted(self.listdir()):
             yield child
     else:
         f = self.open("rb")
         for line in f:
             yield line
         f.close()
 xiter.when_type(ifile)(xiter_ifile)
 
 
 # We need to implement ``xrepr`` for ``ifile`` as a generic function, because
 # otherwise ``xrepr_str`` would kick in.
 def xrepr_ifile(self, mode="default"):
     try:
         if self.isdir():
             name = "idir"
             style = astyle.style_dir
         else:
             name = "ifile"
             style = astyle.style_file
     except IOError:
         name = "ifile"
         style = astyle.style_default
     if mode in ("cell", "header", "footer"):
         abspath = repr(path._base(self.normpath()))
         if abspath.startswith("u"):
             abspath = abspath[2:-1]
         else:
             abspath = abspath[1:-1]
         if mode == "cell":
             yield (style, abspath)
         else:
             yield (style, "%s(%s)" % (name, abspath))
     else:
         yield (style, repr(self))
 xrepr.when_type(ifile)(xrepr_ifile)
 
 
 class ils(Table):
     """
     List the current (or a specified) directory.
 
     Examples::
 
         >>> ils
         <class 'IPython.Extensions.ipipe.ils'>
         >>> ils("/usr/local/lib/python2.4")
         IPython.Extensions.ipipe.ils('/usr/local/lib/python2.4')
         >>> ils("~")
         IPython.Extensions.ipipe.ils('/home/fperez')
         # all-random
     """
     def __init__(self, base=os.curdir, dirs=True, files=True):
         self.base = os.path.expanduser(base)
         self.dirs = dirs
         self.files = files
 
     def __iter__(self):
         base = ifile(self.base)
         yield (base / os.pardir).abspath()
         for child in sorted(base.listdir()):
             if self.dirs:
                 if self.files:
                     yield child
                 else:
                     if child.isdir():
                         yield child
             elif self.files:
                 if not child.isdir():
                     yield child
 
     def __xrepr__(self, mode="default"):
        return xrepr(ifile(self.base), mode)
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self.base)
 
 
 class iglob(Table):
     """
     List all files and directories matching a specified pattern.
     (See ``glob.glob()`` for more info.).
 
     Examples::
 
         >>> iglob("*.py")
         IPython.Extensions.ipipe.iglob('*.py')
     """
     def __init__(self, glob):
         self.glob = glob
 
     def __iter__(self):
         for name in glob.glob(self.glob):
             yield ifile(name)
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer" or mode == "cell":
             yield (astyle.style_default,
                    "%s(%r)" % (self.__class__.__name__, self.glob))
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self.glob)
 
 
 class iwalk(Table):
     """
     List all files and directories in a directory and it's subdirectory::
 
         >>> iwalk
         <class 'IPython.Extensions.ipipe.iwalk'>
         >>> iwalk("/usr/lib")
         IPython.Extensions.ipipe.iwalk('/usr/lib')
         >>> iwalk("~")
         IPython.Extensions.ipipe.iwalk('/home/fperez')  # random
         
     """
     def __init__(self, base=os.curdir, dirs=True, files=True):
         self.base = os.path.expanduser(base)
         self.dirs = dirs
         self.files = files
 
     def __iter__(self):
         for (dirpath, dirnames, filenames) in os.walk(self.base):
             if self.dirs:
                 for name in sorted(dirnames):
                     yield ifile(os.path.join(dirpath, name))
             if self.files:
                 for name in sorted(filenames):
                     yield ifile(os.path.join(dirpath, name))
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer" or mode == "cell":
             yield (astyle.style_default,
                    "%s(%r)" % (self.__class__.__name__, self.base))
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self.base)
 
 
 class ipwdentry(object):
     """
     ``ipwdentry`` objects encapsulate entries in the Unix user account and
     password database.
     """
     def __init__(self, id):
         self._id = id
         self._entry = None
 
     def __eq__(self, other):
         return self.__class__ is other.__class__ and self._id == other._id
 
     def __ne__(self, other):
         return self.__class__ is not other.__class__ or self._id != other._id
 
     def _getentry(self):
         if self._entry is None:
             if isinstance(self._id, basestring):
                 self._entry = pwd.getpwnam(self._id)
             else:
                 self._entry = pwd.getpwuid(self._id)
         return self._entry
 
     def getname(self):
         if isinstance(self._id, basestring):
             return self._id
         else:
             return self._getentry().pw_name
     name = property(getname, None, None, "User name")
 
     def getpasswd(self):
         return self._getentry().pw_passwd
     passwd = property(getpasswd, None, None, "Password")
 
     def getuid(self):
         if isinstance(self._id, basestring):
             return self._getentry().pw_uid
         else:
             return self._id
     uid = property(getuid, None, None, "User id")
 
     def getgid(self):
         return self._getentry().pw_gid
     gid = property(getgid, None, None, "Primary group id")
 
     def getgroup(self):
         return igrpentry(self.gid)
     group = property(getgroup, None, None, "Group")
 
     def getgecos(self):
         return self._getentry().pw_gecos
     gecos = property(getgecos, None, None, "Information (e.g. full user name)")
 
     def getdir(self):
         return self._getentry().pw_dir
     dir = property(getdir, None, None, "$HOME directory")
 
     def getshell(self):
         return self._getentry().pw_shell
     shell = property(getshell, None, None, "Login shell")
 
     def __xattrs__(self, mode="default"):
        return ("name", "passwd", "uid", "gid", "gecos", "dir", "shell")
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self._id)
 
 
 class ipwd(Table):
     """
     List all entries in the Unix user account and password database.
 
     Example::
 
         >>> ipwd | isort("uid")
         <IPython.Extensions.ipipe.isort key='uid' reverse=False at 0x849efec>
         # random
     """
     def __iter__(self):
         for entry in pwd.getpwall():
             yield ipwdentry(entry.pw_name)
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer" or mode == "cell":
             yield (astyle.style_default, "%s()" % self.__class__.__name__)
         else:
             yield (astyle.style_default, repr(self))
 
 
 class igrpentry(object):
     """
     ``igrpentry`` objects encapsulate entries in the Unix group database.
     """
     def __init__(self, id):
         self._id = id
         self._entry = None
 
     def __eq__(self, other):
         return self.__class__ is other.__class__ and self._id == other._id
 
     def __ne__(self, other):
         return self.__class__ is not other.__class__ or self._id != other._id
 
     def _getentry(self):
         if self._entry is None:
             if isinstance(self._id, basestring):
                 self._entry = grp.getgrnam(self._id)
             else:
                 self._entry = grp.getgrgid(self._id)
         return self._entry
 
     def getname(self):
         if isinstance(self._id, basestring):
             return self._id
         else:
             return self._getentry().gr_name
     name = property(getname, None, None, "Group name")
 
     def getpasswd(self):
         return self._getentry().gr_passwd
     passwd = property(getpasswd, None, None, "Password")
 
     def getgid(self):
         if isinstance(self._id, basestring):
             return self._getentry().gr_gid
         else:
             return self._id
     gid = property(getgid, None, None, "Group id")
 
     def getmem(self):
         return self._getentry().gr_mem
     mem = property(getmem, None, None, "Members")
 
     def __xattrs__(self, mode="default"):
         return ("name", "passwd", "gid", "mem")
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer" or mode == "cell":
             yield (astyle.style_default, "group ")
             try:
                 yield (astyle.style_default, self.name)
             except KeyError:
                 if isinstance(self._id, basestring):
                     yield (astyle.style_default, self.name_id)
                 else:
                     yield (astyle.style_type_number, str(self._id))
         else:
             yield (astyle.style_default, repr(self))
 
     def __iter__(self):
         for member in self.mem:
             yield ipwdentry(member)
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self._id)
 
 
 class igrp(Table):
     """
     This ``Table`` lists all entries in the Unix group database.
     """
     def __iter__(self):
         for entry in grp.getgrall():
             yield igrpentry(entry.gr_name)
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             yield (astyle.style_default, "%s()" % self.__class__.__name__)
         else:
             yield (astyle.style_default, repr(self))
 
 
 class Fields(object):
     def __init__(self, fieldnames, **fields):
         self.__fieldnames = [upgradexattr(fieldname) for fieldname in fieldnames]
         for (key, value) in fields.iteritems():
             setattr(self, key, value)
 
     def __xattrs__(self, mode="default"):
         return self.__fieldnames
 
     def __xrepr__(self, mode="default"):
         yield (-1, False)
         if mode == "header" or mode == "cell":
             yield (astyle.style_default, self.__class__.__name__)
             yield (astyle.style_default, "(")
             for (i, f) in enumerate(self.__fieldnames):
                 if i:
                     yield (astyle.style_default, ", ")
                 yield (astyle.style_default, f.name())
                 yield (astyle.style_default, "=")
                 for part in xrepr(getattr(self, f), "default"):
                     yield part
             yield (astyle.style_default, ")")
         elif mode == "footer":
             yield (astyle.style_default, self.__class__.__name__)
             yield (astyle.style_default, "(")
             for (i, f) in enumerate(self.__fieldnames):
                 if i:
                     yield (astyle.style_default, ", ")
                 yield (astyle.style_default, f.name())
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
 
 class FieldTable(Table, list):
     def __init__(self, *fields):
         Table.__init__(self)
         list.__init__(self)
         self.fields = fields
 
     def add(self, **fields):
         self.append(Fields(self.fields, **fields))
 
     def __xrepr__(self, mode="default"):
         yield (-1, False)
         if mode == "header" or mode == "footer":
             yield (astyle.style_default, self.__class__.__name__)
             yield (astyle.style_default, "(")
             for (i, f) in enumerate(self.__fieldnames):
                 if i:
                     yield (astyle.style_default, ", ")
                 yield (astyle.style_default, f)
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "<%s.%s object with fields=%r at 0x%x>" % \
             (self.__class__.__module__, self.__class__.__name__,
              ", ".join(map(repr, self.fields)), id(self))
 
 
 class List(list):
     def __xattrs__(self, mode="default"):
         return xrange(len(self))
 
     def __xrepr__(self, mode="default"):
         yield (-1, False)
         if mode == "header" or mode == "cell" or mode == "footer" or mode == "default":
             yield (astyle.style_default, self.__class__.__name__)
             yield (astyle.style_default, "(")
             for (i, item) in enumerate(self):
                 if i:
                     yield (astyle.style_default, ", ")
                 for part in xrepr(item, "default"):
                     yield part
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
 
 class ienv(Table):
     """
     List environment variables.
 
     Example::
 
         >>> ienv
         <class 'IPython.Extensions.ipipe.ienv'>
     """
 
     def __iter__(self):
         fields = ("key", "value")
         for (key, value) in os.environ.iteritems():
             yield Fields(fields, key=key, value=value)
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "cell":
             yield (astyle.style_default, "%s()" % self.__class__.__name__)
         else:
             yield (astyle.style_default, repr(self))
 
 
 class ihist(Table):
     """
     IPython input history
 
     Example::
 
         >>> ihist
         <class 'IPython.Extensions.ipipe.ihist'>
         >>> ihist(True) # raw mode
         <IPython.Extensions.ipipe.ihist object at 0x849602c>  # random
     """
     def __init__(self, raw=True):
         self.raw = raw
 
     def __iter__(self):
         api = ipapi.get()
         if self.raw:
             for line in api.IP.input_hist_raw:
                 yield line.rstrip("\n")
         else:
             for line in api.IP.input_hist:
                 yield line.rstrip("\n")
 
 
 class Alias(object):
     """
     Entry in the alias table
     """
     def __init__(self, name, args, command):
         self.name = name
         self.args = args
         self.command = command
 
     def __xattrs__(self, mode="default"):
         return ("name", "args", "command")
 
 
 class ialias(Table):
     """
     IPython alias list
 
     Example::
 
         >>> ialias
         <class 'IPython.Extensions.ipipe.ialias'>
     """
     def __iter__(self):
         api = ipapi.get()
 
         for (name, (args, command)) in api.IP.alias_table.iteritems():
             yield Alias(name, args, command)
 
 
 class icsv(Pipe):
     """
     This ``Pipe`` turns the input (with must be a pipe outputting lines
     or an ``ifile``) into lines of CVS columns.
     """
     def __init__(self, **csvargs):
         """
         Create an ``icsv`` object. ``cvsargs`` will be passed through as
         keyword arguments to ``cvs.reader()``.
         """
         self.csvargs = csvargs
 
     def __iter__(self):
         input = self.input
         if isinstance(input, ifile):
             input = input.open("rb")
         reader = csv.reader(input, **self.csvargs)
         for line in reader:
             yield List(line)
 
     def __xrepr__(self, mode="default"):
         yield (-1, False)
         if mode == "header" or mode == "footer":
             input = getattr(self, "input", None)
             if input is not None:
                 for part in xrepr(input, mode):
                     yield part
                 yield (astyle.style_default, " | ")
             yield (astyle.style_default, "%s(" % self.__class__.__name__)
             for (i, (name, value)) in enumerate(self.csvargs.iteritems()):
                 if i:
                     yield (astyle.style_default, ", ")
                 yield (astyle.style_default, name)
                 yield (astyle.style_default, "=")
                 for part in xrepr(value, "default"):
                     yield part
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         args = ", ".join(["%s=%r" % item for item in self.csvargs.iteritems()])
         return "<%s.%s %s at 0x%x>" % \
         (self.__class__.__module__, self.__class__.__name__, args, id(self))
 
 
 class ix(Table):
     """
     Execute a system command and list its output as lines
     (similar to ``os.popen()``).
 
     Examples::
 
         >>> ix("ps x")
         IPython.Extensions.ipipe.ix('ps x')
 
         >>> ix("find .") | ifile
         <IPython.Extensions.ipipe.ieval expr=<class 'IPython.Extensions.ipipe.ifile'> at 0x8509d2c>
         # random
     """
     def __init__(self, cmd):
         self.cmd = cmd
         self._pipeout = None
 
     def __iter__(self):
         (_pipein, self._pipeout) = os.popen4(self.cmd)
         _pipein.close()
         for l in self._pipeout:
             yield l.rstrip("\r\n")
         self._pipeout.close()
         self._pipeout = None
 
     def __del__(self):
         if self._pipeout is not None and not self._pipeout.closed:
             self._pipeout.close()
         self._pipeout = None
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             yield (astyle.style_default,
                    "%s(%r)" % (self.__class__.__name__, self.cmd))
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self.cmd)
 
 
 class ifilter(Pipe):
     """
     Filter an input pipe. Only objects where an expression evaluates to true
     (and doesn't raise an exception) are listed.
 
     Examples::
 
         >>> ils | ifilter("_.isfile() and size>1000")
         >>> igrp | ifilter("len(mem)")
         >>> sys.modules | ifilter(lambda _:_.value is not None)
         # all-random
     """
 
     def __init__(self, expr, globals=None, errors="raiseifallfail"):
         """
         Create an ``ifilter`` object. ``expr`` can be a callable or a string
         containing an expression. ``globals`` will be used as the global
         namespace for calling string expressions (defaulting to IPython's
         user namespace). ``errors`` specifies how exception during evaluation
         of ``expr`` are handled:
 
         ``"drop"``
             drop all items that have errors;
 
         ``"keep"``
             keep all items that have errors;
 
         ``"keeperror"``
             keep the exception of all items that have errors;
 
         ``"raise"``
             raise the exception;
 
         ``"raiseifallfail"``
             raise the first exception if all items have errors; otherwise drop
             those with errors (this is the default).
         """
         self.expr = expr
         self.globals = globals
         self.errors = errors
 
     def __iter__(self):
         if callable(self.expr):
             test = self.expr
         else:
             g = getglobals(self.globals)
             expr = compile(self.expr, "ipipe-expression", "eval")
             def test(item):
                 return eval(expr, g, AttrNamespace(item))
 
         ok = 0
         exc_info = None
         for item in xiter(self.input):
             try:
                 if test(item):
                     yield item
                 ok += 1
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 if self.errors == "drop":
                     pass # Ignore errors
                 elif self.errors == "keep":
                     yield item
                 elif self.errors == "keeperror":
                     yield exc
                 elif self.errors == "raise":
                     raise
                 elif self.errors == "raiseifallfail":
                     if exc_info is None:
                         exc_info = sys.exc_info()
         if not ok and exc_info is not None:
             raise exc_info[0], exc_info[1], exc_info[2]
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             input = getattr(self, "input", None)
             if input is not None:
                 for part in xrepr(input, mode):
                     yield part
                 yield (astyle.style_default, " | ")
             yield (astyle.style_default, "%s(" % self.__class__.__name__)
             for part in xrepr(self.expr, "default"):
                 yield part
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "<%s.%s expr=%r at 0x%x>" % \
             (self.__class__.__module__, self.__class__.__name__,
              self.expr, id(self))
 
 
 class ieval(Pipe):
     """
     Evaluate an expression for each object in the input pipe.
 
     Examples::
 
         >>> ils | ieval("_.abspath()")
         # random
         >>> sys.path | ieval(ifile)
         # random
     """
 
     def __init__(self, expr, globals=None, errors="raiseifallfail"):
         """
         Create an ``ieval`` object. ``expr`` can be a callable or a string
         containing an expression. For the meaning of ``globals`` and
         ``errors`` see ``ifilter``.
         """
         self.expr = expr
         self.globals = globals
         self.errors = errors
 
     def __iter__(self):
         if callable(self.expr):
             do = self.expr
         else:
             g = getglobals(self.globals)
             expr = compile(self.expr, "ipipe-expression", "eval")
             def do(item):
                 return eval(expr, g, AttrNamespace(item))
 
         ok = 0
         exc_info = None
         for item in xiter(self.input):
             try:
                 yield do(item)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except Exception, exc:
                 if self.errors == "drop":
                     pass # Ignore errors
                 elif self.errors == "keep":
                     yield item
                 elif self.errors == "keeperror":
                     yield exc
                 elif self.errors == "raise":
                     raise
                 elif self.errors == "raiseifallfail":
                     if exc_info is None:
                         exc_info = sys.exc_info()
         if not ok and exc_info is not None:
             raise exc_info[0], exc_info[1], exc_info[2]
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             input = getattr(self, "input", None)
             if input is not None:
                 for part in xrepr(input, mode):
                     yield part
                 yield (astyle.style_default, " | ")
             yield (astyle.style_default, "%s(" % self.__class__.__name__)
             for part in xrepr(self.expr, "default"):
                 yield part
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "<%s.%s expr=%r at 0x%x>" % \
             (self.__class__.__module__, self.__class__.__name__,
              self.expr, id(self))
 
 
 class ienum(Pipe):
     """
     Enumerate the input pipe (i.e. wrap each input object in an object
     with ``index`` and ``object`` attributes).
 
     Examples::
 
         >>> xrange(20) | ieval("_,_*_") | ienum | ifilter("index % 2 == 0") | ieval("object")
     """
     skip_doctest = True
     
     def __iter__(self):
         fields = ("index", "object")
         for (index, object) in enumerate(xiter(self.input)):
             yield Fields(fields, index=index, object=object)
 
 
 class isort(Pipe):
     """
     Sorts the input pipe.
 
     Examples::
 
         >>> ils | isort("size")
         <IPython.Extensions.ipipe.isort key='size' reverse=False at 0x849ec2c>
         >>> ils | isort("_.isdir(), _.lower()", reverse=True)
         <IPython.Extensions.ipipe.isort key='_.isdir(), _.lower()' reverse=True at 0x849eacc>
         # all-random
     """
 
     def __init__(self, key=None, globals=None, reverse=False):
         """
         Create an ``isort`` object. ``key`` can be a callable or a string
         containing an expression (or ``None`` in which case the items
         themselves will be sorted). If ``reverse`` is true the sort order
         will be reversed. For the meaning of ``globals`` see ``ifilter``.
         """
         self.key = key
         self.globals = globals
         self.reverse = reverse
 
     def __iter__(self):
         if self.key is None:
             items = sorted(xiter(self.input), reverse=self.reverse)
         elif callable(self.key):
             items = sorted(xiter(self.input), key=self.key, reverse=self.reverse)
         else:
             g = getglobals(self.globals)
             key = compile(self.key, "ipipe-expression", "eval")
             def realkey(item):
                 return eval(key, g, AttrNamespace(item))
             items = sorted(xiter(self.input), key=realkey, reverse=self.reverse)
         for item in items:
             yield item
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             input = getattr(self, "input", None)
             if input is not None:
                 for part in xrepr(input, mode):
                     yield part
                 yield (astyle.style_default, " | ")
             yield (astyle.style_default, "%s(" % self.__class__.__name__)
             for part in xrepr(self.key, "default"):
                 yield part
             if self.reverse:
                 yield (astyle.style_default, ", ")
                 for part in xrepr(True, "default"):
                     yield part
             yield (astyle.style_default, ")")
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "<%s.%s key=%r reverse=%r at 0x%x>" % \
             (self.__class__.__module__, self.__class__.__name__,
              self.key, self.reverse, id(self))
 
 
 tab = 3 # for expandtabs()
 
 def _format(field):
     if isinstance(field, str):
         text = repr(field.expandtabs(tab))[1:-1]
     elif isinstance(field, unicode):
         text = repr(field.expandtabs(tab))[2:-1]
     elif isinstance(field, datetime.datetime):
         # Don't use strftime() here, as this requires year >= 1900
         text = "%04d-%02d-%02d %02d:%02d:%02d.%06d" % \
             (field.year, field.month, field.day,
              field.hour, field.minute, field.second, field.microsecond)
     elif isinstance(field, datetime.date):
         text = "%04d-%02d-%02d" % (field.year, field.month, field.day)
     else:
         text = repr(field)
     return text
 
 
 class Display(object):
     class __metaclass__(type):
         def __ror__(self, input):
             return input | self()
 
     def __init__(self, input=None):
         self.input = input
 
     def __ror__(self, input):
         self.input = input
         return self
 
     def display(self):
         pass
 
 
 class iless(Display):
     cmd = "less --quit-if-one-screen --LONG-PROMPT --LINE-NUMBERS --chop-long-lines --shift=8 --RAW-CONTROL-CHARS"
 
     def display(self):
         try:
             pager = os.popen(self.cmd, "w")
             try:
                 for item in xiter(self.input):
                     first = False
                     for attr in xattrs(item, "default"):
                         if first:
                             first = False
                         else:
                             pager.write(" ")
                         attr = upgradexattr(attr)
                         if not isinstance(attr, SelfDescriptor):
                             pager.write(attr.name())
                             pager.write("=")
                         pager.write(str(attr.value(item)))
                     pager.write("\n")
             finally:
                 pager.close()
         except Exception, exc:
             print "%s: %s" % (exc.__class__.__name__, str(exc))
 
 
 class _RedirectIO(object):
     def __init__(self,*args,**kwargs):
         """
         Map the system output streams to self.
         """
         self.stream = StringIO.StringIO()
         self.stdout = sys.stdout
         sys.stdout = self
         self.stderr = sys.stderr
         sys.stderr = self
 
     def write(self, text):
         """
         Write both to screen and to self.
         """
         self.stream.write(text)
         self.stdout.write(text)
         if "\n" in text:
             self.stdout.flush()
 
     def writelines(self, lines):
         """
         Write lines both to screen and to self.
         """
         self.stream.writelines(lines)
         self.stdout.writelines(lines)
         self.stdout.flush()
 
     def restore(self):
         """
         Restore the default system streams.
         """
         self.stdout.flush()
         self.stderr.flush()
         sys.stdout = self.stdout
         sys.stderr = self.stderr
 
 
 class icap(Table):
     """
     Execute a python string and capture any output to stderr/stdout.
 
     Examples::
 
         >>> import time
         >>> icap("for i in range(10): print i, time.sleep(0.1)")
 
     """
     skip_doctest = True
     
     def __init__(self, expr, globals=None):
         self.expr = expr
         self.globals = globals
         log = _RedirectIO()
         try:
             exec(expr, getglobals(globals))
         finally:
             log.restore()
         self.stream = log.stream
 
     def __iter__(self):
         self.stream.seek(0)
         for line in self.stream:
             yield line.rstrip("\r\n")
 
     def __xrepr__(self, mode="default"):
         if mode == "header" or mode == "footer":
             yield (astyle.style_default,
                    "%s(%r)" % (self.__class__.__name__, self.expr))
         else:
             yield (astyle.style_default, repr(self))
 
     def __repr__(self):
         return "%s.%s(%r)" % \
             (self.__class__.__module__, self.__class__.__name__, self.expr)
 
 
 def xformat(value, mode, maxlength):
     align = None
     full = True
     width = 0
     text = astyle.Text()
     for (style, part) in xrepr(value, mode):
         # only consider the first result
         if align is None:
             if isinstance(style, int):
                 # (style, text) really is (alignment, stop)
                 align = style
                 full = part
                 continue
             else:
                 align = -1
                 full = True
         if not isinstance(style, int):
             text.append((style, part))
             width += len(part)
             if width >= maxlength and not full:
                 text.append((astyle.style_ellisis, "..."))
                 width += 3
                 break
     if align is None: # default to left alignment
         align = -1
     return (align, width, text)
 
 
 
 import astyle
 
 class idump(Display):
     # The approximate maximum length of a column entry
     maxattrlength = 200
 
     # Style for column names
     style_header = astyle.Style.fromstr("white:black:bold")
 
     def __init__(self, input=None, *attrs):
         Display.__init__(self, input)
         self.attrs = [upgradexattr(attr) for attr in attrs]
         self.headerpadchar = " "
         self.headersepchar = "|"
         self.datapadchar = " "
         self.datasepchar = "|"
 
     def display(self):
         stream = genutils.Term.cout
         allattrs = []
         attrset = set()
         colwidths = {}
         rows = []
         for item in xiter(self.input):
             row = {}
             attrs = self.attrs
             if not attrs:
                 attrs = xattrs(item, "default")
             for attr in attrs:
                 if attr not in attrset:
                     allattrs.append(attr)
                     attrset.add(attr)
                     colwidths[attr] = len(attr.name())
                 try:
                     value = attr.value(item)
                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except Exception, exc:
                     value = exc
                 (align, width, text) = xformat(value, "cell", self.maxattrlength)
                 colwidths[attr] = max(colwidths[attr], width)
                 # remember alignment, length and colored parts
                 row[attr] = (align, width, text)
             rows.append(row)
 
         stream.write("\n")
         for (i, attr) in enumerate(allattrs):
             attrname = attr.name()
             self.style_header(attrname).write(stream)
             spc = colwidths[attr] - len(attrname)
             if i < len(colwidths)-1:
                 stream.write(self.headerpadchar*spc)
                 stream.write(self.headersepchar)
         stream.write("\n")
 
         for row in rows:
             for (i, attr) in enumerate(allattrs):
                 (align, width, text) = row[attr]
                 spc = colwidths[attr] - width
                 if align == -1:
                     text.write(stream)
                     if i < len(colwidths)-1:
                         stream.write(self.datapadchar*spc)
                 elif align == 0:
                     spc = colwidths[attr] - width
                     spc1 = spc//2
                     spc2 = spc-spc1
                     stream.write(self.datapadchar*spc1)
                     text.write(stream)
                     if i < len(colwidths)-1:
                         stream.write(self.datapadchar*spc2)
                 else:
                     stream.write(self.datapadchar*spc)
                     text.write(stream)
                 if i < len(colwidths)-1:
                     stream.write(self.datasepchar)
             stream.write("\n")
 
 
 class AttributeDetail(Table):
     """
     ``AttributeDetail`` objects are use for displaying a detailed list of object
     attributes.
     """
     def __init__(self, object, descriptor):
         self.object = object
         self.descriptor = descriptor
 
     def __iter__(self):
         return self.descriptor.iter(self.object)
 
     def name(self):
         return self.descriptor.name()
 
     def attrtype(self):
         return self.descriptor.attrtype(self.object)
 
     def valuetype(self):
         return self.descriptor.valuetype(self.object)
 
     def doc(self):
         return self.descriptor.doc(self.object)
 
     def shortdoc(self):
         return self.descriptor.shortdoc(self.object)
 
     def value(self):
         return self.descriptor.value(self.object)
 
     def __xattrs__(self, mode="default"):
         attrs = ("name()", "attrtype()", "valuetype()", "value()", "shortdoc()")
         if mode == "detail":
             attrs += ("doc()",)
         return attrs
 
     def __xrepr__(self, mode="default"):
         yield (-1, True)
         valuetype = self.valuetype()
         if valuetype is not noitem:
             for part in xrepr(valuetype):
                 yield part
             yield (astyle.style_default, " ")
         yield (astyle.style_default, self.attrtype())
         yield (astyle.style_default, " ")
         yield (astyle.style_default, self.name())
         yield (astyle.style_default, " of ")
         for part in xrepr(self.object):
             yield part
 
 
 try:
     from ibrowse import ibrowse
 except ImportError:
     # No curses (probably Windows) => try igrid
     try:
         from igrid import igrid
     except ImportError:
         # no wx either => use ``idump`` as the default display.
         defaultdisplay = idump
     else:
         defaultdisplay = igrid
         __all__.append("igrid")
 else:
     defaultdisplay = ibrowse
     __all__.append("ibrowse")
 
 
 # If we're running under IPython, register our objects with IPython's
 # generic function ``result_display``, else install a displayhook
 # directly as sys.displayhook
 if generics is not None:
     def display_display(obj):
         return obj.display()
     generics.result_display.when_type(Display)(display_display)
 
     def display_tableobject(obj):
         return display_display(defaultdisplay(obj))
     generics.result_display.when_type(Table)(display_tableobject)
 
     def display_tableclass(obj):
         return display_tableobject(obj())
     generics.result_display.when_type(Table.__metaclass__)(display_tableclass)
 else:
     def installdisplayhook():
         _originalhook = sys.displayhook
         def displayhook(obj):
             if isinstance(obj, type) and issubclass(obj, Table):
                 obj = obj()
             if isinstance(obj, Table):
                 obj = defaultdisplay(obj)
             if isinstance(obj, Display):
                 return obj.display()
             else:
                 _originalhook(obj)
         sys.displayhook = displayhook
     installdisplayhook()

IPython/Extensions/ipy_app_completers.py

@@ -1,19 +1,19 b''
 """ Install various IPython completers
 
 IPython extension that installs the completers related to external apps.
 
 The actual implementations are in Extensions/ipy_completers.py
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from ipy_completers import *
 
 ip.set_hook('complete_command', apt_completer, re_key = '.*apt-get')
 ip.set_hook('complete_command', svn_completer, str_key = 'svn')
 ip.set_hook('complete_command', hg_completer, str_key = 'hg')
 
 # the old bzr completer is deprecated, we recommend ipy_bzr
 #ip.set_hook('complete_command', bzr_completer, str_key = 'bzr')

IPython/Extensions/ipy_autoreload.py

@@ -1,340 +1,340 b''
 """
 IPython extension: autoreload modules before executing the next line
 
 Try:: 
 
     %autoreload?
 
 for documentation.
 """
 
 # Pauli Virtanen <[e-mail]>, 2008.
 # Thomas Heller, 2000.
 #
 # This IPython module is written by Pauli Virtanen, based on the autoreload
 # code by Thomas Heller.
 
 #------------------------------------------------------------------------------
 # Autoreload functionality
 #------------------------------------------------------------------------------
 
 import time, os, threading, sys, types, imp, inspect, traceback, atexit
 import weakref
 
 def _get_compiled_ext():
     """Official way to get the extension of compiled files (.pyc or .pyo)"""
     for ext, mode, typ in imp.get_suffixes():
         if typ == imp.PY_COMPILED:
             return ext
 
 PY_COMPILED_EXT = _get_compiled_ext()
 
 class ModuleReloader(object):
     failed = {}
     """Modules that failed to reload: {module: mtime-on-failed-reload, ...}"""
     
     modules = {}
     """Modules specially marked as autoreloadable."""
 
     skip_modules = {}
     """Modules specially marked as not autoreloadable."""
 
     check_all = True
     """Autoreload all modules, not just those listed in 'modules'"""
 
     old_objects = {}
     """(module-name, name) -> weakref, for replacing old code objects"""
     
     def check(self, check_all=False):
         """Check whether some modules need to be reloaded."""
         
         if check_all or self.check_all:
             modules = sys.modules.keys()
         else:
             modules = self.modules.keys()
         
         for modname in modules:
             m = sys.modules.get(modname, None)
 
             if modname in self.skip_modules:
                 continue
             
             if not hasattr(m, '__file__'):
                 continue
             
             if m.__name__ == '__main__':
                 # we cannot reload(__main__)
                 continue
             
             filename = m.__file__
             dirname = os.path.dirname(filename)
             path, ext = os.path.splitext(filename)
             
             if ext.lower() == '.py':
                 ext = PY_COMPILED_EXT
                 filename = os.path.join(dirname, path + PY_COMPILED_EXT)
             
             if ext != PY_COMPILED_EXT:
                 continue
             
             try:
                 pymtime = os.stat(filename[:-1]).st_mtime
                 if pymtime <= os.stat(filename).st_mtime:
                     continue
                 if self.failed.get(filename[:-1], None) == pymtime:
                     continue
             except OSError:
                 continue
             
             try:
                 superreload(m, reload, self.old_objects)
                 if filename[:-1] in self.failed:
                     del self.failed[filename[:-1]]
             except:
                 print >> sys.stderr, "[autoreload of %s failed: %s]" % (
                         modname, traceback.format_exc(1))
                 self.failed[filename[:-1]] = pymtime
 
 #------------------------------------------------------------------------------
 # superreload
 #------------------------------------------------------------------------------
 
 def update_function(old, new):
     """Upgrade the code object of a function"""
     for name in ['func_code', 'func_defaults', 'func_doc',
                  'func_closure', 'func_globals', 'func_dict']:
         try:
             setattr(old, name, getattr(new, name))
         except (AttributeError, TypeError):
             pass
 
 def update_class(old, new):
     """Replace stuff in the __dict__ of a class, and upgrade
     method code objects"""
     for key in old.__dict__.keys():
         old_obj = getattr(old, key)
 
         try:
             new_obj = getattr(new, key)
         except AttributeError:
             # obsolete attribute: remove it
             try: 
                 delattr(old, key)
             except (AttributeError, TypeError):
                 pass
             continue
         
         if update_generic(old_obj, new_obj): continue
 
         try:
             setattr(old, key, getattr(new, key))
         except (AttributeError, TypeError):
             pass # skip non-writable attributes
 
 def update_property(old, new):
     """Replace get/set/del functions of a property"""
     update_generic(old.fdel, new.fdel)
     update_generic(old.fget, new.fget)
     update_generic(old.fset, new.fset)
 
 def isinstance2(a, b, typ):
     return isinstance(a, typ) and isinstance(b, typ)
 
 UPDATE_RULES = [
     (lambda a, b: isinstance2(a, b, types.ClassType),
      update_class),
     (lambda a, b: isinstance2(a, b, types.TypeType),
      update_class),
     (lambda a, b: isinstance2(a, b, types.FunctionType),
      update_function), 
     (lambda a, b: isinstance2(a, b, property),
      update_property), 
     (lambda a, b: isinstance2(a, b, types.MethodType),
      lambda a, b: update_function(a.im_func, b.im_func)),
 ]
 
 def update_generic(a, b):
     for type_check, update in UPDATE_RULES:
         if type_check(a, b):
             update(a, b)
             return True
     return False
 
 class StrongRef(object):
     def __init__(self, obj):
         self.obj = obj
     def __call__(self):
         return self.obj
 
 def superreload(module, reload=reload, old_objects={}):
     """Enhanced version of the builtin reload function.
    
     superreload remembers objects previously in the module, and
 
     - upgrades the class dictionary of every old class in the module
     - upgrades the code object of every old function and method
     - clears the module's namespace before reloading
     
     """
     
     # collect old objects in the module
     for name, obj in module.__dict__.items():
         if not hasattr(obj, '__module__') or obj.__module__ != module.__name__:
             continue
         key = (module.__name__, name)
         try:
             old_objects.setdefault(key, []).append(weakref.ref(obj))
         except TypeError:
             # weakref doesn't work for all types;
             # create strong references for 'important' cases
             if isinstance(obj, types.ClassType):
                 old_objects.setdefault(key, []).append(StrongRef(obj))
 
     # reload module
     try:
         # clear namespace first from old cruft
         old_name = module.__name__
         module.__dict__.clear()
         module.__dict__['__name__'] = old_name
     except (TypeError, AttributeError, KeyError):
         pass
     module = reload(module)
     
     # iterate over all objects and update functions & classes
     for name, new_obj in module.__dict__.items():
         key = (module.__name__, name)
         if key not in old_objects: continue
 
         new_refs = []
         for old_ref in old_objects[key]:
             old_obj = old_ref()
             if old_obj is None: continue
             new_refs.append(old_ref)
             update_generic(old_obj, new_obj)
 
         if new_refs:
             old_objects[key] = new_refs
         else:
             del old_objects[key]
 
     return module
 
 reloader = ModuleReloader()
 
 #------------------------------------------------------------------------------
 # IPython connectivity
 #------------------------------------------------------------------------------
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 autoreload_enabled = False
 
 def runcode_hook(self):
     if not autoreload_enabled:
-        raise IPython.ipapi.TryNext
+        raise ipapi.TryNext
     try:
         reloader.check()
     except:
         pass
 
 def enable_autoreload():
     global autoreload_enabled
     autoreload_enabled = True
 
 def disable_autoreload():
     global autoreload_enabled
     autoreload_enabled = False
 
 def autoreload_f(self, parameter_s=''):
     r""" %autoreload => Reload modules automatically
     
     %autoreload
     Reload all modules (except those excluded by %aimport) automatically now.
     
     %autoreload 1
     Reload all modules imported with %aimport every time before executing
     the Python code typed.
     
     %autoreload 2
     Reload all modules (except those excluded by %aimport) every time
     before executing the Python code typed.
     
     Reloading Python modules in a reliable way is in general difficult,
     and unexpected things may occur. %autoreload tries to work
     around common pitfalls by replacing code objects of functions
     previously in the module with new versions. This makes the following
     things to work:
 
     - Functions and classes imported via 'from xxx import foo' are upgraded
       to new versions when 'xxx' is reloaded.
     - Methods and properties of classes are upgraded on reload, so that
       calling 'c.foo()' on an object 'c' created before the reload causes
       the new code for 'foo' to be executed.
     
     Some of the known remaining caveats are:
     
     - Replacing code objects does not always succeed: changing a @property
       in a class to an ordinary method or a method to a member variable
       can cause problems (but in old objects only).
     - Functions that are removed (eg. via monkey-patching) from a module
       before it is reloaded are not upgraded.
     - C extension modules cannot be reloaded, and so cannot be
       autoreloaded.
     
     """
     if parameter_s == '':
         reloader.check(True)
     elif parameter_s == '0':
         disable_autoreload()
     elif parameter_s == '1':
         reloader.check_all = False
         enable_autoreload()
     elif parameter_s == '2':
         reloader.check_all = True
         enable_autoreload()
 
 def aimport_f(self, parameter_s=''):
     """%aimport => Import modules for automatic reloading.
 
     %aimport
     List modules to automatically import and not to import.
 
     %aimport foo
     Import module 'foo' and mark it to be autoreloaded for %autoreload 1
 
     %aimport -foo
     Mark module 'foo' to not be autoreloaded for %autoreload 1
 
     """
     
     modname = parameter_s
     if not modname:
         to_reload = reloader.modules.keys()
         to_reload.sort()
         to_skip = reloader.skip_modules.keys()
         to_skip.sort()
         if reloader.check_all:
             print "Modules to reload:\nall-expect-skipped"
         else:
             print "Modules to reload:\n%s" % ' '.join(to_reload)
         print "\nModules to skip:\n%s" % ' '.join(to_skip)
     elif modname.startswith('-'):
         modname = modname[1:]
         try: del reloader.modules[modname]
         except KeyError: pass
         reloader.skip_modules[modname] = True
     else:
         try: del reloader.skip_modules[modname]
         except KeyError: pass
         reloader.modules[modname] = True
 
         mod = __import__(modname)
         ip.to_user_ns({modname: mod})
 
 def init():
     ip.expose_magic('autoreload', autoreload_f)
     ip.expose_magic('aimport', aimport_f)
     ip.set_hook('pre_runcode_hook', runcode_hook)
     
 init()

IPython/Extensions/ipy_completers.py

@@ -1,400 +1,400 b''
 
 """ Implementations for various useful completers
 
 See Extensions/ipy_stock_completers.py on examples of how to enable a completer,
 but the basic idea is to do:
 
 ip.set_hook('complete_command', svn_completer, str_key = 'svn')
 
 """
-import IPython.ipapi
+import IPython.core import ipapi
 import glob,os,shlex,sys
 import inspect
 from time import time
 from zipimport import zipimporter
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 try:
     set
 except:
     from sets import Set as set
 
 TIMEOUT_STORAGE = 3 #Time in seconds after which the rootmodules will be stored
 TIMEOUT_GIVEUP = 20 #Time in seconds after which we give up
 
 def quick_completer(cmd, completions):
     """ Easily create a trivial completer for a command.
 
     Takes either a list of completions, or all completions in string
     (that will be split on whitespace)
     
     Example::
     
         [d:\ipython]|1> import ipy_completers                                       
         [d:\ipython]|2> ipy_completers.quick_completer('foo', ['bar','baz'])        
         [d:\ipython]|3> foo b<TAB>
         bar baz                                                                     
         [d:\ipython]|3> foo ba
     """
     if isinstance(completions, basestring):
         
         completions = completions.split()
     def do_complete(self,event):
         return completions
     
     ip.set_hook('complete_command',do_complete, str_key = cmd)
     
 def getRootModules():
     """
     Returns a list containing the names of all the modules available in the
     folders of the pythonpath.
     """
     modules = []
     if ip.db.has_key('rootmodules'):
         return ip.db['rootmodules']
     t = time()
     store = False
     for path in sys.path:
         modules += moduleList(path)        
         if time() - t >= TIMEOUT_STORAGE and not store:
             store = True
             print "\nCaching the list of root modules, please wait!" 
             print "(This will only be done once - type '%rehashx' to " + \
             "reset cache!)"
             print
         if time() - t > TIMEOUT_GIVEUP:
             print "This is taking too long, we give up."
             print
             ip.db['rootmodules'] = []
             return []
     
     modules += sys.builtin_module_names
       
     modules = list(set(modules))
     if '__init__' in modules:
         modules.remove('__init__')
     modules = list(set(modules))
     if store:
         ip.db['rootmodules'] = modules
     return modules
 
 def moduleList(path):
     """
     Return the list containing the names of the modules available in the given
     folder.
     """
 
     if os.path.isdir(path):
         folder_list = os.listdir(path)
     elif path.endswith('.egg'):
         try:
             folder_list = [f for f in zipimporter(path)._files]
         except:
             folder_list = []
     else:
         folder_list = []
     #folder_list = glob.glob(os.path.join(path,'*'))
     folder_list = [p for p in folder_list  \
        if os.path.exists(os.path.join(path, p,'__init__.py'))\
            or p[-3:] in ('.py','.so')\
            or p[-4:] in ('.pyc','.pyo','.pyd')]
 
     folder_list = [os.path.basename(p).split('.')[0] for p in folder_list]
     return folder_list
 
 def moduleCompletion(line):
     """
     Returns a list containing the completion possibilities for an import line.
     The line looks like this :
     'import xml.d'
     'from xml.dom import'
     """
     def tryImport(mod, only_modules=False):
         def isImportable(module, attr):
             if only_modules:
                 return inspect.ismodule(getattr(module, attr))
             else:
                 return not(attr[:2] == '__' and attr[-2:] == '__')
         try:
             m = __import__(mod)
         except:
             return []
         mods = mod.split('.')
         for module in mods[1:]:
             m = getattr(m,module)
         if (not hasattr(m, '__file__')) or (not only_modules) or\
            (hasattr(m, '__file__') and '__init__' in m.__file__):
             completion_list = [attr for attr in dir(m) if isImportable(m, attr)]
         completion_list.extend(getattr(m,'__all__',[]))
         if hasattr(m, '__file__') and '__init__' in m.__file__:
             completion_list.extend(moduleList(os.path.dirname(m.__file__)))
         completion_list = list(set(completion_list))
         if '__init__' in completion_list:
             completion_list.remove('__init__')
         return completion_list
 
     words = line.split(' ')
     if len(words) == 3 and words[0] == 'from':
         return ['import ']
     if len(words) < 3 and (words[0] in ['import','from']) :
         if len(words) == 1:
             return getRootModules()
         mod = words[1].split('.')
         if len(mod) < 2:
             return getRootModules()
         completion_list = tryImport('.'.join(mod[:-1]), True)
         completion_list = ['.'.join(mod[:-1] + [el]) for el in completion_list]
         return completion_list
     if len(words) >= 3 and words[0] == 'from':
         mod = words[1]
         return tryImport(mod)
 
 def vcs_completer(commands, event):
     """ utility to make writing typical version control app completers easier
 
     VCS command line apps typically have the format:
 
     [sudo ]PROGNAME [help] [command] file file...
 
     """
 
 
     cmd_param = event.line.split()
     if event.line.endswith(' '):
         cmd_param.append('')
 
     if cmd_param[0] == 'sudo':
         cmd_param = cmd_param[1:]
 
     if len(cmd_param) == 2 or 'help' in cmd_param:
         return commands.split()
 
     return ip.IP.Completer.file_matches(event.symbol)
 
 
 pkg_cache = None
 
 def module_completer(self,event):
     """ Give completions after user has typed 'import ...' or 'from ...'"""
 
     # This works in all versions of python.  While 2.5 has
     # pkgutil.walk_packages(), that particular routine is fairly dangerous,
     # since it imports *EVERYTHING* on sys.path.  That is: a) very slow b) full
     # of possibly problematic side effects.
     # This search the folders in the sys.path for available modules.
 
     return moduleCompletion(event.line)
 
 
 svn_commands = """\
 add blame praise annotate ann cat checkout co cleanup commit ci copy
 cp delete del remove rm diff di export help ? h import info list ls
 lock log merge mkdir move mv rename ren propdel pdel pd propedit pedit
 pe propget pget pg proplist plist pl propset pset ps resolved revert
 status stat st switch sw unlock update
 """
 
 def svn_completer(self,event):
     return vcs_completer(svn_commands, event)
 
 
 hg_commands = """
 add addremove annotate archive backout branch branches bundle cat
 clone commit copy diff export grep heads help identify import incoming
 init locate log manifest merge outgoing parents paths pull push
 qapplied qclone qcommit qdelete qdiff qfold qguard qheader qimport
 qinit qnew qnext qpop qprev qpush qrefresh qrename qrestore qsave
 qselect qseries qtop qunapplied recover remove rename revert rollback
 root serve showconfig status strip tag tags tip unbundle update verify
 version
 """
 
 def hg_completer(self,event):
     """ Completer for mercurial commands """
 
     return vcs_completer(hg_commands, event)
 
 
 
 __bzr_commands = None
 
 def bzr_commands():
     global __bzr_commands
     if __bzr_commands is not None:
         return __bzr_commands
     out = os.popen('bzr help commands')
     __bzr_commands = [l.split()[0] for l in out]
     return __bzr_commands                
 
 def bzr_completer(self,event):
     """ Completer for bazaar commands """
     cmd_param = event.line.split()
     if event.line.endswith(' '):
         cmd_param.append('')
 
     if len(cmd_param) > 2:
         cmd = cmd_param[1]
         param = cmd_param[-1]
         output_file = (param == '--output=')
         if cmd == 'help':
             return bzr_commands()
         elif cmd in ['bundle-revisions','conflicts',
                      'deleted','nick','register-branch',
                      'serve','unbind','upgrade','version',
                      'whoami'] and not output_file:
             return []
         else:
             # the rest are probably file names
             return ip.IP.Completer.file_matches(event.symbol)
 
     return bzr_commands()
 
 
 def shlex_split(x):
     """Helper function to split lines into segments."""
     #shlex.split raise exception if syntax error in sh syntax
     #for example if no closing " is found. This function keeps dropping
     #the last character of the line until shlex.split does not raise
     #exception. Adds end of the line to the result of shlex.split
     #example: %run "c:/python  -> ['%run','"c:/python']
     endofline=[]
     while x!="":
         try:
             comps=shlex.split(x)
             if len(endofline)>=1:
                 comps.append("".join(endofline))
             return comps
         except ValueError:
             endofline=[x[-1:]]+endofline
             x=x[:-1]
     return ["".join(endofline)]
 
 def runlistpy(self, event):
     comps = shlex_split(event.line)
     relpath = (len(comps) > 1 and comps[-1] or '').strip("'\"")
 
     #print "\nev=",event  # dbg
     #print "rp=",relpath  # dbg
     #print 'comps=',comps  # dbg
 
     lglob = glob.glob
     isdir = os.path.isdir
     if relpath.startswith('~'):
         relpath = os.path.expanduser(relpath)
     dirs = [f.replace('\\','/') + "/" for f in lglob(relpath+'*')
             if isdir(f)]
 
     # Find if the user has already typed the first filename, after which we
     # should complete on all files, since after the first one other files may
     # be arguments to the input script.
     #filter(
     if filter(lambda f: f.endswith('.py') or f.endswith('.ipy') or
               f.endswith('.pyw'),comps):
         pys =  [f.replace('\\','/') for f in lglob('*')]
     else:
         pys =  [f.replace('\\','/')
                 for f in lglob(relpath+'*.py') + lglob(relpath+'*.ipy') +
                 lglob(relpath + '*.pyw')]
     return dirs + pys
 
 
 greedy_cd_completer = False
 
 def cd_completer(self, event):
     relpath = event.symbol
     #print event # dbg
     if '-b' in event.line:
         # return only bookmark completions
         bkms = self.db.get('bookmarks',{})
         return bkms.keys()
 
     
     if event.symbol == '-':
         width_dh = str(len(str(len(ip.user_ns['_dh']) + 1)))
         # jump in directory history by number
         fmt = '-%0' + width_dh +'d [%s]'
         ents = [ fmt % (i,s) for i,s in enumerate(ip.user_ns['_dh'])]
         if len(ents) > 1:
             return ents
         return []
 
     if event.symbol.startswith('--'):
         return ["--" + os.path.basename(d) for d in ip.user_ns['_dh']]
     
     if relpath.startswith('~'):
         relpath = os.path.expanduser(relpath).replace('\\','/')
     found = []
     for d in [f.replace('\\','/') + '/' for f in glob.glob(relpath+'*')
               if os.path.isdir(f)]:
         if ' ' in d:
             # we don't want to deal with any of that, complex code
             # for this is elsewhere
-            raise IPython.ipapi.TryNext
+            raise ipapi.TryNext
         found.append( d )
 
     if not found:
         if os.path.isdir(relpath):
             return [relpath]
         # if no completions so far, try bookmarks
         bks = self.db.get('bookmarks',{}).keys()
         bkmatches = [s for s in bks if s.startswith(event.symbol)]
         if bkmatches:
             return bkmatches
         
-        raise IPython.ipapi.TryNext
+        raise ipapi.TryNext
 
 
     def single_dir_expand(matches):
         "Recursively expand match lists containing a single dir."
         
         if len(matches) == 1 and os.path.isdir(matches[0]):
             # Takes care of links to directories also.  Use '/'
             # explicitly, even under Windows, so that name completions
             # don't end up escaped.
             d = matches[0]
             if d[-1] in ['/','\\']:
                 d = d[:-1]
 
             subdirs = [p for p in os.listdir(d) if os.path.isdir( d + '/' + p) and not p.startswith('.')]
             if subdirs:
                 matches = [ (d + '/' + p) for p in subdirs ]
                 return single_dir_expand(matches)
             else:
                 return matches
         else:
             return matches
 
     if greedy_cd_completer:
         return single_dir_expand(found)
     else:
         return found
 
 def apt_get_packages(prefix):
     out = os.popen('apt-cache pkgnames')
     for p in out:
         if p.startswith(prefix):
             yield p.rstrip()
     
     
 apt_commands = """\
 update upgrade install remove purge source build-dep dist-upgrade
 dselect-upgrade clean autoclean check"""
 
 def apt_completer(self, event):
     """ Completer for apt-get (uses apt-cache internally)
 
     """
 
 
     cmd_param = event.line.split()
     if event.line.endswith(' '):
         cmd_param.append('')
 
     if cmd_param[0] == 'sudo':
         cmd_param = cmd_param[1:]
 
     if len(cmd_param) == 2 or 'help' in cmd_param:
         return apt_commands.split()
 
     return list(apt_get_packages(event.symbol))
 

IPython/Extensions/ipy_defaults.py

@@ -1,62 +1,62 b''
 """ Set default options for IPython. 
 
 Just import this module to get reasonable defaults for everything.
 
 These configurations used to be performed in ipythonrc (or ipythonrc.ini). 
 Therefore importing this in your config files makes ipython basically
 ignore your ipythonrc. This is *not* imported by default, you need to import 
 this manually in one of your config files.
 
 You can further override these defaults in e.g. your ipy_user_config.py,
 ipy_profile_PROFILENAME etc.
 
 """
 
 import IPython.rlineimpl as readline
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 o = ip.options
 
 o.colors = "Linux"
 o.color_info=1
 o.confirm_exit=1
 o.pprint=1
 o.multi_line_specials=1
 o.xmode="Context"
 
 
 o.prompt_in1='In [\#]: '
 o.prompt_in2 ='   .\D.: '
 o.prompt_out = 'Out[\#]: '
 o.prompts_pad_left=1
 
 o.autoindent = 1
 
 o.readline_remove_delims="-/~"
 o.readline_merge_completions=1
 
 o.readline = 1
 
 rlopts = """\
 tab: complete
 "\C-l": possible-completions
 set show-all-if-ambiguous on
 "\C-o": tab-insert
 "\M-i": "    "
 "\M-o": "\d\d\d\d"
 "\M-I": "\d\d\d\d"
 "\C-r": reverse-search-history
 "\C-s": forward-search-history
 "\C-p": history-search-backward
 "\C-n": history-search-forward
 "\e[A": history-search-backward
 "\e[B": history-search-forward
 "\C-k": kill-line
 "\C-u": unix-line-discard"""
 
 if readline.have_readline:
     for cmd in rlopts.split('\n'):
         readline.parse_and_bind(cmd)
     
     

IPython/Extensions/ipy_editors.py

@@ -1,88 +1,88 b''
 """ 'editor' hooks for common editors that work well with ipython
 
 They should honor the line number argument, at least.
 
 Contributions are *very* welcome.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 from IPython.Itpl import itplns
 import os
 
 def install_editor(run_template, wait = False):
     """ Gets a template in format "myeditor bah bah $file bah bah $line"
     
     $file will be replaced by file name, $line by line number (or 0).
     Installs the editor that is called by IPython, instead of the default
     notepad or vi.
     
     If wait is true, wait until the user presses enter before returning,
     to facilitate non-blocking editors that exit immediately after
     the call.
     """
     
     def call_editor(self, file, line=0):
         if line is None:
             line = 0
         cmd = itplns(run_template, locals())
         print ">",cmd
         if os.system(cmd) != 0:
-            raise IPython.ipapi.TryNext()
+            raise ipapi.TryNext()
         if wait:
             raw_input("Press Enter when done editing:")
 
     ip.set_hook('editor',call_editor)
 
 
 # in these, exe is always the path/name of the executable. Useful
 # if you don't have the editor directory in your path
 
 def komodo(exe = 'komodo'):
     """ Activestate Komodo [Edit] """
     install_editor(exe + ' -l $line "$file"', wait = True)
 
 def scite(exe = "scite"):
     """ SciTE or Sc1 """
     install_editor(exe + ' "$file" -goto:$line')
 
 def notepadplusplus(exe = 'notepad++'):
     """ Notepad++ http://notepad-plus.sourceforge.net """
     install_editor(exe + ' -n$line "$file"')
     
 def jed(exe = 'jed'):
     """ JED, the lightweight emacsish editor """
     install_editor(exe + ' +$line "$file"')
 
 def idle(exe = None):
     """ Idle, the editor bundled with python
     
     Should be pretty smart about finding the executable.
     """
     if exe is None:
         import idlelib
         p = os.path.dirname(idlelib.__file__)
         exe = p + '/idle.py'
     install_editor(exe + ' "$file"')
 
 def mate(exe = 'mate'):
     """ TextMate, the missing editor"""
     install_editor(exe + ' -w -l $line "$file"')
 
 # these are untested, report any problems
 
 def emacs(exe = 'emacs'):
     install_editor(exe + ' +$line "$file"')
 
 def gnuclient(exe= 'gnuclient'):
     install_editor(exe + ' -nw +$line "$file"')
 
 def crimson_editor(exe = 'cedt.exe'):
     install_editor(exe + ' /L:$line "$file"')
     
 def kate(exe = 'kate'):
     install_editor(exe + ' -u -l $line "$file"')
     
    
     
  No newline at end of file

IPython/Extensions/ipy_exportdb.py

@@ -1,76 +1,76 b''
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,pprint
 
 def export(filename = None):
 
-    lines = ['import IPython.ipapi', 'ip = IPython.ipapi.get()','']
+    lines = ['import IPython.core.ipapi', 'ip = IPython.core.ipapi.get()','']
 
     vars = ip.db.keys('autorestore/*')
     vars.sort()
     varstomove = []
     get = ip.db.get
     
     macros = []
     variables = []
     
     for var in vars:
         k = os.path.basename(var)
         v = get(var)
 
         if k.startswith('_'):
             continue
         if isinstance(v, IPython.macro.Macro):
             macros.append((k,v))
         if type(v) in [int, str, float]:
             variables.append((k,v))
             
             
 
     if macros:
         lines.extend(['# === Macros ===' ,''])
     for k,v in macros:
         lines.append("ip.defmacro('%s'," % k)
         for line in v.value.splitlines():
             lines.append(' ' + repr(line+'\n'))
         lines.extend([')', ''])
         
     if variables:
         lines.extend(['','# === Variables ===',''])
         for k,v in variables:
             varstomove.append(k)
             lines.append('%s = %s' % (k,repr(v)))
                 
         lines.append('ip.to_user_ns("%s")' % (' '.join(varstomove)))
     
     bkms = ip.db.get('bookmarks',{})
     
     if bkms:
         lines.extend(['','# === Bookmarks ===',''])
         lines.append("ip.db['bookmarks'] = %s " % pprint.pformat(bkms, indent = 2) )
         
     aliases = ip.db.get('stored_aliases', {} )
     
     if aliases:
         lines.extend(['','# === Alias definitions ===',''])
         for k,v in aliases.items():
             try:
                 lines.append("ip.defalias('%s', %s)" % (k, repr(v[1])))
             except (AttributeError, TypeError):
                 pass
 
     env = ip.db.get('stored_env')
     if env:
         lines.extend(['','# === Stored env vars ===',''])
         lines.append("ip.db['stored_env'] = %s " % pprint.pformat(env, indent = 2) )
         
     
     
     out = '\n'.join(lines)
     
     if filename:
         open(filename,'w').write(out)
     else:
         print out
     

IPython/Extensions/ipy_extutil.py

@@ -1,43 +1,43 b''
 """ IPython extension management tools.
 
 After installation, you'll have the 'extutil' object in your namespace.
 to.
 """
 
 # for the purposes of this module, every module that has the name 'ip' globally
 # installed as below is an IPython extension
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import sys,textwrap,inspect
 
 def indent(s, ind= '    '):
     return '\n'.join([ind +l for l in s.splitlines()])
 
 class ExtUtil:
     """ IPython extensios (ipy_* etc.) management utilities """
     
     def describe(self):
         for n,mod in self._active():
             doc = inspect.getdoc(mod)
             if doc:
                 print '== %s ==' % n
                 print indent(doc)
             
             
     def ls(self):
         """ Show list of installed extensions. """
         for n,m in self._active():
             print '%-20s %s' % (n,m.__file__.replace('\\','/'))
     def _active(self):
         act = []
         for mname,m in sys.modules.items():
             o = getattr(m, 'ip', None)
-            if isinstance(o, IPython.ipapi.IPApi):
+            if isinstance(o, ipapi.IPApi):
                 act.append((mname,m))
         act.sort()                
         return act
 
 extutil = ExtUtil()                
 ip.to_user_ns('extutil')

IPython/Extensions/ipy_fsops.py

@@ -1,245 +1,245 b''
 """ File system operations
 
 Contains: Simple variants of normal unix shell commands (icp, imv, irm,
 imkdir, igrep).
 
 Some "otherwise handy" utils ('collect' for gathering files to
 ~/_ipython/collect, 'inote' for collecting single note lines to
 ~/_ipython/note.txt)
 
 Mostly of use for bare windows installations where cygwin/equivalent is not
 installed and you would otherwise need to deal with dos versions of the
 commands (that e.g. don't understand / as path separator). These can
 do some useful tricks on their own, though (like use 'mglob' patterns).
 
 Not to be confused with ipipe commands (ils etc.) that also start with i.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import shutil,os,shlex
 from IPython.external import mglob
 from IPython.external.path import path
-from IPython.ipapi import UsageError
+from IPython.core.ipapi import UsageError
 import IPython.utils.generics
 
 def parse_args(args):
     """ Given arg string 'CMD files... target', return ([files], target) """
     
     tup = args.split(None, 1)
     if len(tup) == 1:
         raise UsageError("Expected arguments for " + tup[0])
     
     tup2 = shlex.split(tup[1])
     
     flist, trg = mglob.expand(tup2[0:-1]), tup2[-1]
     if not flist:
         raise UsageError("No files found:" + str(tup2[0:-1]))
     return flist, trg
     
 def icp(ip,arg):
     """ icp files... targetdir
     
     Copy all files to target, creating dirs for target if necessary
     
     icp srcdir dstdir
     
     Copy srcdir to distdir
     
     """
     import distutils.dir_util
     
     fs, targetdir = parse_args(arg)
     if not os.path.isdir(targetdir) and len(fs) > 1:
         distutils.dir_util.mkpath(targetdir,verbose =1)
     for f in fs:
         if os.path.isdir(f):
             shutil.copytree(f, targetdir)
         else:
             shutil.copy2(f,targetdir)
     return fs
 ip.defalias("icp",icp)
 
 def imv(ip,arg):
     """ imv src tgt
     
     Move source to target.
     """
     
     fs, target = parse_args(arg)
     if len(fs) > 1:
         assert os.path.isdir(target)
     for f in fs:        
         shutil.move(f, target)
     return fs
 ip.defalias("imv",imv)        
 
 def irm(ip,arg):
     """ irm path[s]...
     
     Remove file[s] or dir[s] path. Dirs are deleted recursively.
     """
     try:
         paths = mglob.expand(arg.split(None,1)[1])
     except IndexError:
         raise UsageError("%irm paths...")
     import distutils.dir_util
     for p in paths:
         print "rm",p
         if os.path.isdir(p):
             distutils.dir_util.remove_tree(p, verbose = 1)
         else:
             os.remove(p)
 
 ip.defalias("irm",irm)
 
 def imkdir(ip,arg):
     """ imkdir path
     
     Creates dir path, and all dirs on the road
     """
     import distutils.dir_util
     targetdir = arg.split(None,1)[1]
     distutils.dir_util.mkpath(targetdir,verbose =1)    
 
 ip.defalias("imkdir",imkdir)    
 
 def igrep(ip,arg):
     """ igrep PAT files...
     
     Very dumb file scan, case-insensitive.
     
     e.g.
     
     igrep "test this" rec:*.py
     
     """
     elems = shlex.split(arg)
     dummy, pat, fs = elems[0], elems[1], mglob.expand(elems[2:])
     res = []
     for f in fs:
         found = False
         for l in open(f):
             if pat.lower() in l.lower():
                 if not found:
                     print "[[",f,"]]"
                     found = True
                     res.append(f)
                 print l.rstrip()
     return res
 
 ip.defalias("igrep",igrep)    
 
 def collect(ip,arg):
     """ collect foo/a.txt rec:bar=*.py
     
     Copies foo/a.txt to ~/_ipython/collect/foo/a.txt and *.py from bar,
     likewise
     
     Without args, try to open ~/_ipython/collect dir (in win32 at least).
     """
     from IPython.external.path import path
     basedir = path(ip.options.ipythondir + '/collect')
     try:    
         fs = mglob.expand(arg.split(None,1)[1])
     except IndexError:
         os.startfile(basedir)
         return
     for f in fs:
         f = path(f)
         trg = basedir / f.splitdrive()[1].lstrip('/\\')
         if f.isdir():
             print "mkdir",trg
             trg.makedirs()
             continue
         dname = trg.dirname()
         if not dname.isdir():
             dname.makedirs()
         print f,"=>",trg
         shutil.copy2(f,trg)
 
 ip.defalias("collect",collect)            
 
 def inote(ip,arg):
     """ inote Hello world
     
     Adds timestamp and Hello world to ~/_ipython/notes.txt
     
     Without args, opens notes.txt for editing.
     """
     import time
     fname = ip.options.ipythondir + '/notes.txt'
     
     try:
         entry = " === " + time.asctime() + ': ===\n' + arg.split(None,1)[1] + '\n'
         f= open(fname, 'a').write(entry)    
     except IndexError:
         ip.IP.hooks.editor(fname)        
 
 ip.defalias("inote",inote)
 
 def pathobj_mangle(p):
     return p.replace(' ', '__').replace('.','DOT')
 def pathobj_unmangle(s):
     return s.replace('__',' ').replace('DOT','.')
 
 
     
 class PathObj(path):
     def __init__(self,p):
         self.path = p
         if p != '.':
             self.ents = [pathobj_mangle(ent) for ent in os.listdir(p)]
         else:
             self.ents = None
     def __complete__(self):
         if self.path != '.':
             return self.ents
         self.ents = [pathobj_mangle(ent) for ent in os.listdir('.')]
         return self.ents
     def __getattr__(self,name):
         if name in self.ents:
             if self.path.endswith('/'):
                 sep = ''
             else:
                 sep = '/'
                 
             tgt = self.path + sep + pathobj_unmangle(name)
             #print "tgt",tgt
             if os.path.isdir(tgt):
                 return PathObj(tgt)
             if os.path.isfile(tgt):
                 return path(tgt)
 
         raise AttributeError, name  # <<< DON'T FORGET THIS LINE !!
     def __str__(self):
         return self.path
         
     def __repr__(self):
         return "<PathObj to %s>" % self.path
     
     def __call__(self):
         print "cd:",self.path
         os.chdir(self.path)
         
 def complete_pathobj(obj, prev_completions):    
     if hasattr(obj,'__complete__'):
         res = obj.__complete__()
         if res:
             return res
     # just return normal attributes of 'path' object if the dir is empty
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 complete_pathobj = IPython.utils.generics.complete_object.when_type(PathObj)(complete_pathobj)
 
 def test_pathobj():
     #p = PathObj('c:/prj')
     #p2 = p.cgi
     #print p,p2
     rootdir = PathObj("/")
     startmenu = PathObj("d:/Documents and Settings/All Users/Start Menu/Programs")
     cwd = PathObj('.')
     ip.to_user_ns("rootdir startmenu cwd")
     
 #test_pathobj()
  No newline at end of file

IPython/Extensions/ipy_gnuglobal.py

@@ -1,38 +1,38 b''
 #!/usr/bin/env python
 
 
 """
 Add %global magic for GNU Global usage.
 
 http://www.gnu.org/software/global/
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 import os
 
 # alter to your liking
 global_bin = 'd:/opt/global/bin/global'
 
 def global_f(self,cmdline):
     simple = 0
     if '-' not in cmdline:
         cmdline  = '-rx ' + cmdline
         simple = 1
         
     lines = [l.rstrip() for l in os.popen( global_bin + ' ' + cmdline ).readlines()]
     
     if simple:
         parts = [l.split(None,3) for l in lines]
         lines = ['%s [%s]\n%s' % (p[2].rjust(70),p[1],p[3].rstrip()) for p in parts]
     print "\n".join(lines)
 
 ip.expose_magic('global', global_f)
 
 def global_completer(self,event):
     compl = [l.rstrip() for l in os.popen(global_bin + ' -c ' + event.symbol).readlines()]
     return compl    
 
 ip.set_hook('complete_command', global_completer, str_key = '%global')
 

IPython/Extensions/ipy_greedycompleter.py

@@ -1,76 +1,76 b''
 """ Greedy completer extension for IPython
 
 Normal tab completer refuses to evaluate nonsafe stuff. This will evaluate
 everything, so you need to consider the consequences of pressing tab 
 yourself!
 
 Note that this extension simplifies readline interaction by setting
 only whitespace as completer delimiter. If this works well, we will
 do the same in default completer.
 
 """
-from IPython import ipapi
+from IPython.core import ipapi
 from IPython.utils import generics
 from IPython.utils.genutils import dir2
 
 def attr_matches(self, text):
     """Compute matches when text contains a dot.
 
     MONKEYPATCHED VERSION (ipy_greedycompleter.py)
     
     Assuming the text is of the form NAME.NAME....[NAME], and is
     evaluatable in self.namespace or self.global_namespace, it will be
     evaluated and its attributes (as revealed by dir()) are used as
     possible completions.  (For class instances, class members are are
     also considered.)
 
     WARNING: this can still invoke arbitrary C code, if an object
     with a __getattr__ hook is evaluated.
 
     """
     import re
 
     force_complete = 1
     # Another option, seems to work great. Catches things like ''.<tab>
     m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text)
 
     if m:
         expr, attr = m.group(1, 3)
     else:
         # force match - eval anything that ends with colon
         if not force_complete:
             return []
                 
         m2 = re.match(r"(.+)\.(\w*)$", self.lbuf)
         if not m2:
             return []
         expr, attr = m2.group(1,2)
         
             
     try:        
         obj = eval(expr, self.namespace)
     except:
         try:
             obj = eval(expr, self.global_namespace)
         except:
             return []
 
     words = dir2(obj)
     
     try:
         words = generics.complete_object(obj, words)
     except ipapi.TryNext:
         pass
     # Build match list to return
     n = len(attr)
     res = ["%s.%s" % (expr, w) for w in words if w[:n] == attr ]
     return res
 
 def main():
     import IPython.rlineimpl as readline
     readline.set_completer_delims(" \n\t")
     # monkeypatch - the code will be folded to normal completer later on
     import IPython.core.completer
     IPython.core.completer.Completer.attr_matches = attr_matches
 
 main()
  No newline at end of file

IPython/Extensions/ipy_jot.py

@@ -1,311 +1,311 b''
 # -*- coding: utf-8 -*-
 """
 %jot magic for lightweight persistence.
 
 Stores variables in Struct with some notes in PicleShare database
 
 
 """
 
 from datetime import datetime 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import pickleshare
 
 import inspect,pickle,os,sys,textwrap
 from IPython.core.fakemodule import FakeModule
 from IPython.ipstruct import Struct 
 
 
 def refresh_variables(ip, key=None):
     db = ip.db
     if key is None:
         keys = db.keys('jot/*')
     else:
         keys = db.keys('jot/'+key)
     for key in keys:
         # strip autorestore
         justkey = os.path.basename(key)
         print "Restoring from", justkey, "..."
         try:
             obj = db[key]
         except KeyError:
             print "Unable to restore variable '%s', ignoring (use %%jot -d to forget!)" % justkey
             print "The error was:",sys.exc_info()[0]
         else:
             #print "restored",justkey,"=",obj #dbg
             try:
                 origname = obj.name
             except:
                 ip.user_ns[justkey] = obj
                 print "Restored", justkey
             else:
                 ip.user_ns[origname] = obj['val']
                 print "Restored", origname 
 
 def read_variables(ip, key=None):
     db = ip.db
     if key is None:
         return None
     else:
         keys = db.keys('jot/'+key)
     for key in keys:
         # strip autorestore
         justkey = os.path.basename(key)
         print "restoring from ", justkey 
         try:
             obj = db[key]
         except KeyError:
             print "Unable to read variable '%s', ignoring (use %%jot -d to forget!)" % justkey
             print "The error was:",sys.exc_info()[0]
         else:
             return obj
 
 
 def detail_variables(ip, key=None):
     db, get = ip.db, ip.db.get
  
     if key is None:
         keys = db.keys('jot/*')
     else:
         keys = db.keys('jot/'+key)
     if keys:
         size = max(map(len,keys))
     else:
         size = 0
 
     fmthead = '%-'+str(size)+'s [%s]'
     fmtbody = 'Comment:\n %s'
     fmtdata = 'Data:\n %s, %s'
     for key in keys:
         v = get(key,'<unavailable>')
         justkey = os.path.basename(key)
         try: 
             print fmthead % (justkey, datetime.ctime(v.get('time','<unavailable>')))
             print fmtbody % (v.get('comment','<unavailable>'))
             d = v.get('val','unavailable')
             print fmtdata % (repr(type(d)), '')
             print repr(d)[0:200]
             print
             print
         except AttributeError:
             print fmt % (justkey, '<unavailable>', '<unavailable>', repr(v)[:50])
 
 
 def intm(n):
     try:
         return int(n)
     except:
         return 0
 
 def jot_obj(self, obj, name, comment=''):
     """
     write obj data to the note database, with whatever that should be noted.
     """
     had = self.db.keys('jot/'+name+'*')
     # if it the same name but a later version, we stupidly add a number to the 
     # so the name doesn't collide. Any better idea?
     suffix = ''
     if len(had)>0:
         pre = os.path.commonprefix(had)
         suf = [n.split(pre)[1] for n in had]
         versions = map(intm, suf)
         suffix = str(max(versions)+1)
 
     uname = 'jot/'+name+suffix
 
     # which one works better? 
     #all = ip.IP.shadowhist.all()
     all = ip.IP.shell.input_hist
 
     # We may actually want to make snapshot of files that are run-ned.
 
     # get the comment 
     try:
         comment = ip.IP.magic_edit('-x').strip()
     except:
         print "No comment is recorded."
         comment = ''
 
     self.db[uname] = Struct({'val':obj, 
                 'time'  :   datetime.now(), 
                 'hist'  :   all,
                 'name'  :   name,
                 'comment' : comment,})
 
     print "Jotted down notes for '%s' (%s)" % (uname, obj.__class__.__name__)
 
     
 
 def magic_jot(self, parameter_s=''):
     """Lightweight persistence for python variables.
 
     Example:
     
     ville@badger[~]|1> A = ['hello',10,'world']\\
     ville@badger[~]|2> %jot A\\
     ville@badger[~]|3> Exit
     
     (IPython session is closed and started again...)
     
     ville@badger:~$ ipython -p pysh\\
     ville@badger[~]|1> print A
     
     ['hello', 10, 'world']
     
     Usage:
     
     %jot          - Show list of all variables and their current values\\
     %jot -l       - Show list of all variables and their current values in detail\\
     %jot -l <var> - Show one variable and its current values in detail\\
     %jot <var>    - Store the *current* value of the variable to disk\\
     %jot -d <var> - Remove the variable and its value from storage\\
     %jot -z       - Remove all variables from storage (disabled)\\
     %jot -r <var> - Refresh/Load variable from jot (delete current vals)\\
     %jot foo >a.txt  - Store value of foo to new file a.txt\\
     %jot foo >>a.txt - Append value of foo to file a.txt\\   
     
     It should be noted that if you change the value of a variable, you
     need to %note it again if you want to persist the new value.
     
     Note also that the variables will need to be pickleable; most basic
     python types can be safely %stored.
     
     """
     
     opts,argsl = self.parse_options(parameter_s,'drzl',mode='string')
     args = argsl.split(None,1)
     ip = self.getapi()
     db = ip.db
     # delete
     if opts.has_key('d'):
         try:
             todel = args[0]
         except IndexError:
             error('You must provide the variable to forget')
         else:
             try:
                 del db['jot/' + todel]
             except:
                 error("Can't delete variable '%s'" % todel)
     # reset the whole database
     elif opts.has_key('z'):
         print "reseting the whole database has been disabled."
         #for k in db.keys('autorestore/*'):
         #    del db[k]
 
     elif opts.has_key('r'):
         try:
             toret = args[0]
         except:
             print "restoring all the variables jotted down..."
             refresh_variables(ip)
         else:
             refresh_variables(ip, toret)
 
     elif opts.has_key('l'):
         try:
             tolist = args[0]
         except:
             print "List details for all the items."
             detail_variables(ip)
         else:
             print "Details for", tolist, ":"
             detail_variables(ip, tolist)
     
     # run without arguments -> list noted variables & notes 
     elif not args:
         vars = self.db.keys('jot/*')
         vars.sort()            
         if vars:
             size = max(map(len,vars)) - 4 
         else:
             size = 0
             
         print 'Variables and their in-db values:'
         fmt = '%-'+str(size)+'s [%s] -> %s'
         get = db.get
         for var in vars:
             justkey = os.path.basename(var)
             v = get(var,'<unavailable>')
             try: 
                 print fmt % (justkey,\
                     datetime.ctime(v.get('time','<unavailable>')),\
                     v.get('comment','<unavailable>')[:70].replace('\n',' '),)
             except AttributeError:
                 print fmt % (justkey, '<unavailable>', '<unavailable>', repr(v)[:50])
 
     
     # default action - store the variable
     else:
         # %store foo >file.txt or >>file.txt
         if len(args) > 1 and args[1].startswith('>'):
             fnam = os.path.expanduser(args[1].lstrip('>').lstrip())
             if args[1].startswith('>>'):
                 fil = open(fnam,'a')
             else:
                 fil = open(fnam,'w')
             obj = ip.ev(args[0])
             print "Writing '%s' (%s) to file '%s'." % (args[0],
               obj.__class__.__name__, fnam)
 
             
             if not isinstance (obj,basestring):
                 from pprint import pprint
                 pprint(obj,fil)
             else:
                 fil.write(obj)
                 if not obj.endswith('\n'):
                     fil.write('\n')
             
             fil.close()
             return
         
         # %note foo
         try:
             obj = ip.user_ns[args[0]]
         except KeyError:
             # this should not be alias, for aliases, use %store
             print
             print "Error: %s doesn't exist." % args[0]
             print 
             print "Use %note -r <var> to retrieve variables. This should not be used " +\
                   "to store alias, for saving aliases, use %store" 
             return
         else:
             if isinstance(inspect.getmodule(obj), FakeModule):
                 print textwrap.dedent("""\
                 Warning:%s is %s 
                 Proper storage of interactively declared classes (or instances
                 of those classes) is not possible! Only instances
                 of classes in real modules on file system can be %%store'd.
                 """ % (args[0], obj) ) 
                 return
             #pickled = pickle.dumps(obj)
             #self.db[ 'jot/' + args[0] ] = obj
             jot_obj(self, obj, args[0])
 
 
 def magic_read(self, parameter_s=''):
     """    
     %read <var> - Load variable from data that is jotted down.\\
     
     """
     
     opts,argsl = self.parse_options(parameter_s,'drzl',mode='string')
     args = argsl.split(None,1)
     ip = self.getapi()
     db = ip.db
     #if opts.has_key('r'):
     try:
         toret = args[0]
     except:
         print "which record do you want to read out?"
         return
     else:
         return read_variables(ip, toret)
 
 
 ip.expose_magic('jot',magic_jot)
 ip.expose_magic('read',magic_read)

IPython/Extensions/ipy_legacy.py

@@ -1,62 +1,62 b''
 """ Legacy stuff
 
 Various stuff that are there for historical / familiarity reasons.
 
 This is automatically imported by default profile, though not other profiles
 (e.g. 'sh' profile).
 
 Stuff that is considered obsolete / redundant is gradually moved here.
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 
 from IPython.utils.genutils import *
 
 # use rehashx
 
 def magic_rehash(self, parameter_s = ''):
     """Update the alias table with all entries in $PATH.
 
     This version does no checks on execute permissions or whether the
     contents of $PATH are truly files (instead of directories or something
     else).  For such a safer (but slower) version, use %rehashx."""
 
     # This function (and rehashx) manipulate the alias_table directly
     # rather than calling magic_alias, for speed reasons.  A rehash on a
     # typical Linux box involves several thousand entries, so efficiency
     # here is a top concern.
 
     path = filter(os.path.isdir,os.environ.get('PATH','').split(os.pathsep))
     alias_table = self.shell.alias_table
     for pdir in path:
         for ff in os.listdir(pdir):
             # each entry in the alias table must be (N,name), where
             # N is the number of positional arguments of the alias.
             alias_table[ff] = (0,ff)
     # Make sure the alias table doesn't contain keywords or builtins
     self.shell.alias_table_validate()
     # Call again init_auto_alias() so we get 'rm -i' and other modified
     # aliases since %rehash will probably clobber them
     self.shell.init_auto_alias()
 
 ip.expose_magic("rehash", magic_rehash)
 
 # Exit
 def magic_Quit(self, parameter_s=''):
     """Exit IPython without confirmation (like %Exit)."""
 
     self.shell.ask_exit()
 
 ip.expose_magic("Quit", magic_Quit)
 
 
 # make it autocallable fn if you really need it
 def magic_p(self, parameter_s=''):
     """Just a short alias for Python's 'print'."""
     exec 'print ' + parameter_s in self.shell.user_ns
 
 ip.expose_magic("p", magic_p)

IPython/Extensions/ipy_lookfor.py

@@ -1,234 +1,234 b''
 """
 IPython extension: %lookfor command for searching docstrings
 
 """
 # Pauli Virtanen <[e-mail]>, 2008.
 
 import re, inspect, pkgutil, pydoc
 
 #------------------------------------------------------------------------------
 # Lookfor functionality
 #------------------------------------------------------------------------------
 
 # Cache for lookfor: {id(module): {name: (docstring, kind, index), ...}...}
 # where kind: "func", "class", "module", "object"
 # and index: index in breadth-first namespace traversal
 _lookfor_caches = {}
 
 # regexp whose match indicates that the string may contain a function signature
 _function_signature_re = re.compile(r"[a-z_]+\(.*[,=].*\)", re.I)
 
 def lookfor(what, modules=None, import_modules=True, regenerate=False):
     """
     Search for objects whose documentation contains all given words.
     Shows a summary of matching objects, sorted roughly by relevance.
 
     Parameters
     ----------
     what : str
         String containing words to look for.
 
     module : str, module
         Module whose docstrings to go through.
     import_modules : bool
         Whether to import sub-modules in packages.
         Will import only modules in __all__
     regenerate: bool
         Re-generate the docstring cache
 
     """
     # Cache
     cache = {}
     for module in modules:
         try:
             c = _lookfor_generate_cache(module, import_modules, regenerate)
             cache.update(c)
         except ImportError:
             pass
     
     # Search
     # XXX: maybe using a real stemming search engine would be better?
     found = []
     whats = str(what).lower().split()
     if not whats: return
 
     for name, (docstring, kind, index) in cache.iteritems():
         if kind in ('module', 'object'): 
             # don't show modules or objects
             continue
         ok = True
         doc = docstring.lower()
         for w in whats:
             if w not in doc:
                 ok = False
                 break
         if ok:
             found.append(name)
 
     # Relevance sort
     # XXX: this is full Harrison-Stetson heuristics now,
     # XXX: it probably could be improved
 
     kind_relevance = {'func': 1000, 'class': 1000, 
                       'module': -1000, 'object': -1000}
 
     def relevance(name, docstr, kind, index):
         r = 0
         # do the keywords occur within the start of the docstring?
         first_doc = "\n".join(docstr.lower().strip().split("\n")[:3])
         r += sum([200 for w in whats if w in first_doc])
         # do the keywords occur in the function name?
         r += sum([30 for w in whats if w in name])
         # is the full name long?
         r += -len(name) * 5
         # is the object of bad type?
         r += kind_relevance.get(kind, -1000)
         # is the object deep in namespace hierarchy?
         r += -name.count('.') * 10
         r += max(-index / 100, -100)
         return r
 
     def relevance_sort(a, b):
         dr = relevance(b, *cache[b]) - relevance(a, *cache[a])
         if dr != 0: return dr
         else: return cmp(a, b)
     found.sort(relevance_sort)
 
     # Pretty-print
     s = "Search results for '%s'" % (' '.join(whats))
     help_text = [s, "-"*len(s)]
     for name in found:
         doc, kind, ix = cache[name]
 
         doclines = [line.strip() for line in doc.strip().split("\n")
                     if line.strip()]
 
         # find a suitable short description
         try:
             first_doc = doclines[0].strip()
             if _function_signature_re.search(first_doc):
                 first_doc = doclines[1].strip()
         except IndexError:
             first_doc = ""
         help_text.append("%s\n    %s" % (name, first_doc))
 
     # Output
     if len(help_text) > 10:
         pager = pydoc.getpager()
         pager("\n".join(help_text))
     else:
         print "\n".join(help_text)
 
 def _lookfor_generate_cache(module, import_modules, regenerate):
     """
     Generate docstring cache for given module.
 
     Parameters
     ----------
     module : str, None, module
         Module for which to generate docstring cache
     import_modules : bool
         Whether to import sub-modules in packages.
         Will import only modules in __all__
     regenerate: bool
         Re-generate the docstring cache
 
     Returns
     -------
     cache : dict {obj_full_name: (docstring, kind, index), ...}
         Docstring cache for the module, either cached one (regenerate=False)
         or newly generated.
         
     """
     global _lookfor_caches
 
     if module is None:
         module = "numpy"
 
     if isinstance(module, str):
         module = __import__(module)
 
     if id(module) in _lookfor_caches and not regenerate:
         return _lookfor_caches[id(module)]
 
     # walk items and collect docstrings
     cache = {}
     _lookfor_caches[id(module)] = cache
     seen = {}
     index = 0
     stack = [(module.__name__, module)]
     while stack:
         name, item = stack.pop(0)
         if id(item) in seen: continue
         seen[id(item)] = True
 
         index += 1
         kind = "object"
        
         if inspect.ismodule(item):
             kind = "module"
             try:
                 _all = item.__all__
             except AttributeError:
                 _all = None
             # import sub-packages
             if import_modules and hasattr(item, '__path__'):
                 for m in pkgutil.iter_modules(item.__path__):
                     if _all is not None and m[1] not in _all:
                         continue
                     try:
                         __import__("%s.%s" % (name, m[1]))
                     except ImportError:
                         continue
             for n, v in inspect.getmembers(item):
                 if _all is not None and n not in _all:
                     continue
                 stack.append(("%s.%s" % (name, n), v))
         elif inspect.isclass(item):
             kind = "class"
             for n, v in inspect.getmembers(item):
                 stack.append(("%s.%s" % (name, n), v))
         elif callable(item):
             kind = "func"
         
         doc = inspect.getdoc(item)
         if doc is not None:
             cache[name] = (doc, kind, index)
 
     return cache
 
 #------------------------------------------------------------------------------
 # IPython connectivity
 #------------------------------------------------------------------------------
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 _lookfor_modules = ['numpy', 'scipy']
 
 def lookfor_f(self, arg=''):
     r"""
     Search for objects whose documentation contains all given words.
     Shows a summary of matching objects, sorted roughly by relevance.
 
     Usage
     -----
     %lookfor +numpy  some words
     Search module 'numpy'
 
     %lookfor_modules numpy scipy
     Set default modules whose docstrings to search
 
     """
     lookfor(arg, modules=_lookfor_modules)
 
 def lookfor_modules_f(self, arg=''):
     global _lookfor_modules
     if not arg:
         print "Modules included in %lookfor search:", _lookfor_modules
     else:
         _lookfor_modules = arg.split()
 
 ip.expose_magic('lookfor', lookfor_f)
 ip.expose_magic('lookfor_modules', lookfor_modules_f)
 

IPython/Extensions/ipy_p4.py

@@ -1,47 +1,47 b''
 # -*- coding: utf-8 -*-
 """
 Add %p4 magic for pythonic p4 (Perforce) usage.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys,marshal
 
 import ipy_stock_completers
 
 def p4_f(self, parameter_s=''):
     cmd = 'p4 -G ' + parameter_s
     fobj = os.popen(cmd)
     out = []
     while 1:
         try:
             out.append(marshal.load(fobj))
         except EOFError:
             break
         
     return out
 
 def p4d(fname):
     return os.popen('p4 where ' + fname).read().split()[0]
     
 ip.to_user_ns("p4d")
 
 ip.expose_magic('p4', p4_f)
 
 p4_commands = """\
 add admin annotate branch branches change changes changelist
 changelists client clients counter counters delete depot depots
 describe diff diff2 dirs edit filelog files fix fixes flush fstat
 group groups have help info integrate integrated job jobs jobspec
 label labels labelsync lock logger login logout monitor obliterate
 opened passwd print protect rename reopen resolve resolved revert
 review reviews set submit sync tag tickets triggers typemap unlock
 user users verify workspace workspaces where"""
     
 def p4_completer(self,event):
     return ipy_stock_completers.vcs_completer(p4_commands, event)
 
 ip.set_hook('complete_command', p4_completer, str_key = '%p4')
 ip.set_hook('complete_command', p4_completer, str_key = 'p4')
 

IPython/Extensions/ipy_pretty.py

@@ -1,132 +1,132 b''
 """ Use pretty.py for configurable pretty-printing.
 
 Register pretty-printers for types using ipy_pretty.for_type() or
 ipy_pretty.for_type_by_name(). For example, to use the example pretty-printer
 for numpy dtype objects, add the following to your ipy_user_conf.py::
 
     from IPython.Extensions import ipy_pretty
 
     ipy_pretty.activate()
 
     # If you want to have numpy always imported anyways:
     import numpy
     ipy_pretty.for_type(numpy.dtype, ipy_pretty.dtype_pprinter)
 
     # If you don't want to have numpy imported until it needs to be:
     ipy_pretty.for_type_by_name('numpy', 'dtype', ipy_pretty.dtype_pprinter)
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import Term
 
 from IPython.external import pretty
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 
 #### Implementation ############################################################
 
 def pretty_result_display(self, arg):
     """ Uber-pretty-printing display hook.
 
     Called for displaying the result to the user.
     """
     
     if ip.options.pprint:
         verbose = getattr(ip.options, 'pretty_verbose', False)
         out = pretty.pretty(arg, verbose=verbose)
         if '\n' in out:
             # So that multi-line strings line up with the left column of
             # the screen, instead of having the output prompt mess up
             # their first line.                
             Term.cout.write('\n')
         print >>Term.cout, out
     else:
         raise TryNext
 
 
 #### API #######################################################################
 
 # Expose the for_type and for_type_by_name functions for easier use.
 for_type = pretty.for_type
 for_type_by_name = pretty.for_type_by_name
 
 
 # FIXME: write deactivate(). We need a way to remove a hook.
 def activate():
     """ Activate this extension.
     """
     ip.set_hook('result_display', pretty_result_display, priority=99)
 
 
 #### Example pretty-printers ###################################################
 
 def dtype_pprinter(obj, p, cycle):
     """ A pretty-printer for numpy dtype objects.
     """
     if cycle:
         return p.text('dtype(...)')
     if obj.fields is None:
         p.text(repr(obj))
     else:
         p.begin_group(7, 'dtype([')
         for i, field in enumerate(obj.descr):
             if i > 0:
                 p.text(',')
                 p.breakable()
             p.pretty(field)
         p.end_group(7, '])')
 
 
 #### Tests #####################################################################
 
 def test_pretty():
     """
     In [1]: from IPython.Extensions import ipy_pretty
 
     In [2]: ipy_pretty.activate()
 
     In [3]: class A(object):
        ...:     def __repr__(self):
        ...:         return 'A()'
        ...:     
        ...:     
 
     In [4]: a = A()
 
     In [5]: a
     Out[5]: A()
 
     In [6]: def a_pretty_printer(obj, p, cycle):
        ...:     p.text('<A>')
        ...:     
        ...:     
 
     In [7]: ipy_pretty.for_type(A, a_pretty_printer)
 
     In [8]: a
     Out[8]: <A>
 
     In [9]: class B(object):
        ...:     def __repr__(self):
        ...:         return 'B()'
        ...:     
        ...:     
 
     In [10]: B.__module__, B.__name__
     Out[10]: ('__main__', 'B')
 
     In [11]: def b_pretty_printer(obj, p, cycle):
        ....:     p.text('<B>')
        ....:     
        ....:     
 
     In [12]: ipy_pretty.for_type_by_name('__main__', 'B', b_pretty_printer)
 
     In [13]: b = B()
 
     In [14]: b
     Out[14]: <B>
     """
     assert False, "This should only be doctested, not run."
 

IPython/Extensions/ipy_profile_doctest.py

@@ -1,46 +1,46 b''
 """Config file for 'doctest' profile.
 
 This profile modifies the prompts to be the standard Python ones, so that you
 can generate easily doctests from an IPython session.
 
 But more importantly, it enables pasting of code with '>>>' prompts and
 arbitrary initial whitespace, as is typical of doctests in reST files and
 docstrings.  This allows you to easily re-run existing doctests and iteratively
 work on them as part of your development workflow.
 
 The exception mode is also set to 'plain' so the generated exceptions are as
 similar as possible to the default Python ones, for inclusion in doctests."""
 
 # get various stuff that are there for historical / familiarity reasons
 import ipy_legacy
 
-from  IPython import ipapi
+from IPython.core import ipapi
 
 from IPython.Extensions import InterpreterPasteInput
 
 def main():    
     ip = ipapi.get()
     o = ip.options
 
     # Set the prompts similar to the defaults
     o.prompt_in1 = '>>> '
     o.prompt_in2 = '... '
     o.prompt_out = ''
 
     # Add a blank line before each new set of inputs.  This is needed by
     # doctest to distinguish each test from the next.
     o.separate_in = '\n'
     o.separate_out = ''
     o.separate_out2 = ''
 
     # Disable pprint, so that outputs are printed as similarly to standard
     # python as possible
     o.pprint = False
     
     # Use plain exceptions, to also resemble normal pyhton.
     o.xmode = 'plain'
 
     # Store the activity flag in the metadata bag from the running shell
     ip.IP.meta.doctest_mode = True
 
 main()

IPython/Extensions/ipy_profile_numpy.py

@@ -1,24 +1,24 b''
 """ IPython 'numpy' profile, to preload NumPy.
 
 This profile loads the math/cmath modules as well as all of numpy.
 
 It exposes numpy via the 'np' shorthand as well for convenience.
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import ipy_defaults
 
 def main():
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
 
     try:
         ip.ex("import math,cmath")
         ip.ex("import numpy")
         ip.ex("import numpy as np")
 
         ip.ex("from numpy import *")
 
     except ImportError:
         print "Unable to start NumPy profile, is numpy installed?"
     
 main()

IPython/Extensions/ipy_profile_scipy.py

@@ -1,29 +1,29 b''
 """ IPython 'scipy' profile, preloads NumPy and SciPy.
 
 This profile loads the math/cmath modules as well as all of numpy and scipy.
 
 It exposes numpy and scipy via the 'np' and 'sp' shorthands as well for
 convenience.
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import ipy_defaults
 
 def main():
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
 
     try:
         ip.ex("import math,cmath")
         ip.ex("import numpy")
         ip.ex("import scipy")
 
         ip.ex("import numpy as np")
         ip.ex("import scipy as sp")
     
         ip.ex("from numpy import *")
         ip.ex("from scipy import *")
 
     except ImportError:
         print "Unable to start scipy profile, are numpy and scipy installed?"
     
 main()

IPython/Extensions/ipy_profile_sh.py

@@ -1,270 +1,270 b''
 """Shell mode for IPython.
 
 Start ipython in shell mode by invoking "ipython -p sh"
 
 (the old version, "ipython -p pysh" still works but this is the more "modern" 
 shell mode and is recommended for users who don't care about pysh-mode
 compatibility)
 """
 
-from IPython import ipapi
+from IPython.core import ipapi
 import os,re,textwrap
 
 # The import below effectively obsoletes your old-style ipythonrc[.ini],
 # so consider yourself warned!
 
 import ipy_defaults
 
 def main():    
     ip = ipapi.get()
     o = ip.options
     # autocall to "full" mode (smart mode is default, I like full mode)
     
     o.autocall = 2
     
     # Jason Orendorff's path class is handy to have in user namespace
     # if you are doing shell-like stuff
     try:
         ip.ex("from IPython.external.path import path" )
     except ImportError:
         pass
     
     # beefed up %env is handy in shell mode
     import envpersist
     
     # To see where mycmd resides (in path/aliases), do %which mycmd 
     import ipy_which
     
     # tab completers for hg, svn, ...
     import ipy_app_completers
     
     # To make executables foo and bar in mybin usable without PATH change, do:
     # %rehashdir c:/mybin
     # %store foo
     # %store bar
     import ipy_rehashdir
 
     # does not work without subprocess module!
     #import ipy_signals
     
     ip.ex('import os')
     ip.ex("def up(): os.chdir('..')")
     ip.user_ns['LA'] = LastArgFinder() 
     
     # You can assign to _prompt_title variable 
     # to provide some extra information for prompt
     # (e.g. the current mode, host/username...)
 
     ip.user_ns['_prompt_title'] = ''
     
     # Nice prompt
     o.prompt_in1= r'\C_Green${_prompt_title}\C_LightBlue[\C_LightCyan\Y2\C_LightBlue]\C_Green|\#> '
     o.prompt_in2= r'\C_Green|\C_LightGreen\D\C_Green> '
     o.prompt_out= '<\#> '
     
     from IPython import Release
 
     import sys
     # Non-chatty banner
     o.banner = "IPython %s   [on Py %s]\n" % (Release.version,sys.version.split(None,1)[0])
     
     
     ip.IP.default_option('cd','-q')
     ip.IP.default_option('macro', '-r')
     # If you only rarely want to execute the things you %edit...  
     #ip.IP.default_option('edit','-x')
     
 
     o.prompts_pad_left="1"
     # Remove all blank lines in between prompts, like a normal shell.
     o.separate_in="0"
     o.separate_out="0"
     o.separate_out2="0"
     
     # now alias all syscommands
     
     db = ip.db
     
     syscmds = db.get("syscmdlist",[] )
     if not syscmds:
         print textwrap.dedent("""
         System command list not initialized, probably the first run...
         running %rehashx to refresh the command list. Run %rehashx
         again to refresh command list (after installing new software etc.)
         """)
         ip.magic('rehashx')
         syscmds = db.get("syscmdlist")
     
     # lowcase aliases on win32 only
     if os.name == 'posix':
         mapper = lambda s:s
     else:
         def mapper(s): return s.lower()
         
     for cmd in syscmds:
         # print "sys",cmd #dbg
         noext, ext = os.path.splitext(cmd)
         if ext.lower() == '.exe':
             cmd = noext
         
         key = mapper(cmd)
         if key not in ip.IP.alias_table:
             # Dots will be removed from alias names, since ipython
             # assumes names with dots to be python code
             
             ip.defalias(key.replace('.',''), cmd)
 
     # mglob combines 'find', recursion, exclusion... '%mglob?' to learn more
     ip.load("IPython.external.mglob")    
 
     # win32 is crippled w/o cygwin, try to help it a little bit
     if sys.platform == 'win32':
         if 'cygwin' in os.environ['PATH'].lower():          
             # use the colors of cygwin ls (recommended)
             ip.defalias('d', 'ls -F --color=auto')
         else:
             # get icp, imv, imkdir, igrep, irm,...
             ip.load('ipy_fsops')
             
             # and the next best thing to real 'ls -F'
             ip.defalias('d','dir /w /og /on')
     
     ip.set_hook('input_prefilter', slash_prefilter_f)
     extend_shell_behavior(ip)
 
 class LastArgFinder:
     """ Allow $LA to work as "last argument of previous command", like $! in bash
     
     To call this in normal IPython code, do LA()
     """
     def __call__(self, hist_idx = None):
         ip = ipapi.get()
         if hist_idx is None:
             return str(self)
         return ip.IP.input_hist_raw[hist_idx].strip().split()[-1]
     def __str__(self):
         ip = ipapi.get()        
         for cmd in reversed(ip.IP.input_hist_raw):
             parts = cmd.strip().split()
             if len(parts) < 2 or parts[-1] in ['$LA', 'LA()']:
                 continue
             return parts[-1]
         return ""
 
 def slash_prefilter_f(self,line):
     """ ./foo, ~/foo and /bin/foo now run foo as system command
     
     Removes the need for doing !./foo, !~/foo or !/bin/foo
     """
     from IPython.utils import genutils
     if re.match('(?:[.~]|/[a-zA-Z_0-9]+)/', line):
         return "_ip.system(" + genutils.make_quoted_expr(line)+")"
     raise ipapi.TryNext
 
 # XXX You do not need to understand the next function!
 # This should probably be moved out of profile
 
 def extend_shell_behavior(ip):
 
     # Instead of making signature a global variable tie it to IPSHELL.
     # In future if it is required to distinguish between different
     # shells we can assign a signature per shell basis
     ip.IP.__sig__ = 0xa005
     # mark the IPSHELL with this signature
     ip.IP.user_ns['__builtins__'].__dict__['__sig__'] = ip.IP.__sig__
 
     from IPython.Itpl import ItplNS
     from IPython.genutils import shell
     # utility to expand user variables via Itpl
     # xxx do something sensible with depth?
     ip.IP.var_expand = lambda cmd, lvars=None, depth=2: \
         str(ItplNS(cmd, ip.IP.user_ns, get_locals()))
 
     def get_locals():
         """ Substituting a variable through Itpl deep inside the IPSHELL stack
             requires the knowledge of all the variables in scope upto the last
             IPSHELL frame. This routine simply merges all the local variables
             on the IPSHELL stack without worrying about their scope rules
         """
         import sys
         # note lambda expression constitues a function call
         # hence fno should be incremented by one
         getsig = lambda fno: sys._getframe(fno+1).f_globals \
                              ['__builtins__'].__dict__['__sig__']
         getlvars = lambda fno: sys._getframe(fno+1).f_locals
         # trackback until we enter the IPSHELL
         frame_no = 1
         sig = ip.IP.__sig__
         fsig = ~sig
         while fsig != sig :
             try:
                 fsig = getsig(frame_no)
             except (AttributeError, KeyError):
                 frame_no += 1
             except ValueError:
                 # stack is depleted
                 # call did not originate from IPSHELL
                 return {}
         first_frame = frame_no
         # walk further back until we exit from IPSHELL or deplete stack
         try:
             while(sig == getsig(frame_no+1)):
                 frame_no += 1
         except (AttributeError, KeyError, ValueError):
             pass
         # merge the locals from top down hence overriding
         # any re-definitions of variables, functions etc.
         lvars = {}
         for fno in range(frame_no, first_frame-1, -1):
             lvars.update(getlvars(fno))
         #print '\n'*5, first_frame, frame_no, '\n', lvars, '\n'*5 #dbg
         return lvars
 
     def _runlines(lines):
         """Run a string of one or more lines of source.
 
         This method is capable of running a string containing multiple source
         lines, as if they had been entered at the IPython prompt.  Since it
         exposes IPython's processing machinery, the given strings can contain
         magic calls (%magic), special shell access (!cmd), etc."""
 
         # We must start with a clean buffer, in case this is run from an
         # interactive IPython session (via a magic, for example).
         ip.IP.resetbuffer()
         lines = lines.split('\n')
         more = 0
         command = ''
         for line in lines:
             # skip blank lines so we don't mess up the prompt counter, but do
             # NOT skip even a blank line if we are in a code block (more is
             # true)
             # if command is not empty trim the line
             if command != '' :
                 line = line.strip()
             # add the broken line to the command
             if line and line[-1] == '\\' :
                 command += line[0:-1] + ' '
                 more = True
                 continue
             else :
                 # add the last (current) line to the command
                 command += line
                 if command or more:
                     # push to raw history, so hist line numbers stay in sync
                     ip.IP.input_hist_raw.append("# " + command + "\n")
                     
                     more = ip.IP.push(ip.IP.prefilter(command,more))
                     command = ''
                     # IPython's runsource returns None if there was an error
                     # compiling the code.  This allows us to stop processing right
                     # away, so the user gets the error message at the right place.
                     if more is None:
                         break
         # final newline in case the input didn't have it, so that the code
         # actually does get executed
         if more:
             ip.IP.push('\n')
 
     ip.IP.runlines = _runlines
 
 main()

IPython/Extensions/ipy_profile_zope.py

@@ -1,321 +1,321 b''
 # -*- coding: utf-8 -*-
 """ An ipython profile for zope and plone.
 
 Some ideas stolen from http://www.tomster.org.
 
 
 Authors
 -------
 - Stefan Eletzhofer <[e-mail]>
 """
 
 # File: ipy_profile_zope.py
 #
 # Copyright (c) InQuant GmbH
 #
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 
-from IPython import ipapi
+from IPython.core import ipapi
 from IPython import Release
 from types import StringType
 import sys
 import os
 import textwrap
 
 # The import below effectively obsoletes your old-style ipythonrc[.ini],
 # so consider yourself warned!
 # import ipy_defaults
 
 _marker = []
 def shasattr(obj, attr, acquire=False):
     """ See Archetypes/utils.py
     """
     if not acquire:
         obj = obj.aq_base
     return getattr(obj, attr, _marker) is not _marker
 
 class ZopeDebug(object):
     def __init__(self):
 
         self.instancehome = os.environ.get( "INSTANCE_HOME" )
 
         configfile = os.environ.get( "CONFIG_FILE" )
         if configfile is None and self.instancehome is not None:
             configfile = os.path.join( self.instancehome, "etc", "zope.conf" )
 
         if configfile is None:
             raise RuntimeError( "CONFIG_FILE env not set" )
 
         print "CONFIG_FILE=", configfile
         print "INSTANCE_HOME=", self.instancehome
 
         self.configfile = configfile
 
         try:
             from Zope2 import configure
         except ImportError:
             from Zope import configure
 
         configure( configfile )
 
         try:
             import Zope2
             app = Zope2.app()
         except ImportError:
             import Zope
             app = Zope.app()
 
         from Testing.makerequest import makerequest
         self.app = makerequest( app )
 
         try:
             self._make_permissive()
             print "Permissive security installed"
         except:
             print "Permissive security NOT installed"
 
         self._pwd = self.portal or self.app
 
         try:
             from zope.component import getSiteManager
             from zope.component import getGlobalSiteManager
             from zope.app.component.hooks import setSite
 
             if self.portal is not None:
                 setSite( self.portal )
 
                 gsm = getGlobalSiteManager()
                 sm = getSiteManager()
 
                 if sm is gsm:
                     print "ERROR SETTING SITE!"
         except:
             pass
 
 
     @property
     def utils(self):
         class Utils(object):
             commit = self.commit
             sync = self.sync
             objectInfo = self.objectInfo
             ls = self.ls
             pwd = self.pwd
             cd = self.cd
             su = self.su
             getCatalogInfo = self.getCatalogInfo
 
             @property
             def cwd(self):
                 return self.pwd()
 
         return Utils()
 
     @property
     def namespace(self):
         return dict( utils=self.utils, app=self.app, portal=self.portal )
 
     @property
     def portal(self):
         portals = self.app.objectValues( "Plone Site" )
         if len(portals):
             return portals[0]
         else:
             raise KeyError( "No Plone Site found.")
 
     def pwd(self):
         return self._pwd
 
     def _make_permissive(self):
         """
         Make a permissive security manager with all rights. Hell,
         we're developers, aren't we? Security is for whimps. :)
         """
         from Products.CMFCore.tests.base.security import PermissiveSecurityPolicy
         import AccessControl
         from AccessControl.SecurityManagement import newSecurityManager
         from AccessControl.SecurityManager import setSecurityPolicy
 
         _policy = PermissiveSecurityPolicy()
         self.oldpolicy = setSecurityPolicy(_policy)
         newSecurityManager(None, AccessControl.User.system)
 
     def su(self, username):
         """ Change to named user.
         """
         # TODO Make it easy to change back to permissive security.
         user = self.portal.acl_users.getUser(username)
         if not user:
             print "Can't find %s in %s" % (username, self.portal.acl_users)
             return
 
         from AccessControl import ZopeSecurityPolicy
         import AccessControl
         from AccessControl.SecurityManagement import newSecurityManager, getSecurityManager
         from AccessControl.SecurityManager import setSecurityPolicy
 
         _policy = ZopeSecurityPolicy
         self.oldpolicy = setSecurityPolicy(_policy)
         wrapped_user = user.__of__(self.portal.acl_users)
         newSecurityManager(None, user)
         print 'User changed.'
         return getSecurityManager().getUser()
 
     def getCatalogInfo(self, obj=None, catalog='portal_catalog', query=None, sort_on='created', sort_order='reverse' ):
         """ Inspect portal_catalog. Pass an object or object id for a
         default query on that object, or pass an explicit query.
         """
         if obj and query:
             print "Ignoring %s, using query." % obj
 
         catalog = self.portal.get(catalog)
         if not catalog:
             return 'No catalog'
 
         indexes = catalog._catalog.indexes
         if not query:
             if type(obj) is StringType:
                 cwd = self.pwd()
                 obj = cwd.unrestrictedTraverse( obj )
             # If the default in the signature is mutable, its value will
             # persist across invocations.
             query = {}
             if indexes.get('path'):
                 from string import join
                 path = join(obj.getPhysicalPath(), '/') 
                 query.update({'path': path})
             if indexes.get('getID'):
                 query.update({'getID': obj.id, })
             if indexes.get('UID') and shasattr(obj, 'UID'):
                 query.update({'UID': obj.UID(), })
         if indexes.get(sort_on):
             query.update({'sort_on': sort_on, 'sort_order': sort_order})
         if not query:
             return 'Empty query'
         results = catalog(**query)
 
         result_info = []
         for r in results:
             rid = r.getRID()
             if rid:
                 result_info.append(
                         {'path': catalog.getpath(rid),
                         'metadata': catalog.getMetadataForRID(rid),
                         'indexes': catalog.getIndexDataForRID(rid), }
                         )
             else:
                 result_info.append({'missing': rid})
 
         if len(result_info) == 1:
             return result_info[0]
         return result_info
 
     def commit(self):
         """
         Commit the transaction.
         """
         try:
             import transaction
             transaction.get().commit()
         except ImportError:
             get_transaction().commit()
 
     def sync(self):
         """
         Sync the app's view of the zodb.
         """
         self.app._p_jar.sync()
 
     def objectInfo( self, o ):
         """
         Return a descriptive string of an object
         """
         Title = ""
         t = getattr( o, 'Title', None )
         if t:
             Title = t()
         return {'id': o.getId(),
                 'Title': Title,
                 'portal_type': getattr( o, 'portal_type', o.meta_type),
                 'folderish': o.isPrincipiaFolderish
                 }
 
     def cd( self, path ):
         """
         Change current dir to a specific folder.
 
          cd( ".." )
          cd( "/plone/Members/admin" )
          cd( portal.Members.admin )
          etc.
         """
         if type(path) is not StringType:
             path = '/'.join(path.getPhysicalPath())
         cwd = self.pwd()
         x = cwd.unrestrictedTraverse( path )
         if x is None:
             raise KeyError( "Can't cd to %s" % path )
 
         print "%s -> %s" % ( self.pwd().getId(), x.getId() )
         self._pwd = x
 
     def ls( self, x=None ):
         """
         List object(s)
         """
         if type(x) is StringType:
             cwd = self.pwd()
             x = cwd.unrestrictedTraverse( x )
         if x is None:
             x = self.pwd()
         if x.isPrincipiaFolderish:
             return [self.objectInfo(o) for id, o in x.objectItems()]
         else:
             return self.objectInfo( x )
 
 zope_debug = None
 
 def ipy_set_trace():
     from IPython.core import debugger
     debugger.Pdb().set_trace()
 
 def main():
     global zope_debug
     ip = ipapi.get()
     o = ip.options
     # autocall to "full" mode (smart mode is default, I like full mode)
     
     SOFTWARE_HOME = os.environ.get( "SOFTWARE_HOME" )
     sys.path.append( SOFTWARE_HOME )
     print "SOFTWARE_HOME=%s\n" % SOFTWARE_HOME
 
     zope_debug = ZopeDebug()
 
     # <HACK ALERT>
     import pdb;
     pdb.set_trace = ipy_set_trace
     # </HACK ALERT>
 
     # I like my banner minimal.
     o.banner = "ZOPE Py %s IPy %s\n" % (sys.version.split('\n')[0],Release.version)
 
     print textwrap.dedent("""\
         ZOPE mode iPython shell.
 
           Bound names:
            app
            portal
            utils.{ %s }
   
         Uses the $SOFTWARE_HOME and $CONFIG_FILE environment
         variables.
         """ % ( ",".join([ x for x in dir(zope_debug.utils) if not x.startswith("_") ] ) ) )
 
 
     ip.user_ns.update( zope_debug.namespace )
 
 
 main()
 # vim: set ft=python ts=4 sw=4 expandtab :

IPython/Extensions/ipy_pydb.py

@@ -1,31 +1,31 b''
 import inspect
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import arg_split
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from IPython.core import debugger
 
 def call_pydb(self, args):
     """Invoke pydb with the supplied parameters."""
     try:
         import pydb
     except ImportError:
         raise ImportError("pydb doesn't seem to be installed.")
 
     if not hasattr(pydb.pydb, "runv"):
         raise ImportError("You need pydb version 1.19 or later installed.")
 
     argl = arg_split(args)
     # print argl # dbg
     if len(inspect.getargspec(pydb.runv)[0]) == 2:
         pdb = debugger.Pdb(color_scheme=self.rc.colors)
         ip.IP.history_saving_wrapper( lambda : pydb.runv(argl, pdb) )()
     else:
         ip.IP.history_saving_wrapper( lambda : pydb.runv(argl) )()
 
     
 ip.expose_magic("pydb",call_pydb)    
 
     
     
     

IPython/Extensions/ipy_rehashdir.py

@@ -1,140 +1,140 b''
 # -*- coding: utf-8 -*-
 """ IPython extension: add %rehashdir magic
 
 Usage:
 
 %rehashdir c:/bin c:/tools
   - Add all executables under c:/bin and c:/tools to alias table, in 
   order to make them directly executable from any directory.
   
 This also serves as an example on how to extend ipython
 with new magic functions.
 
 Unlike rest of ipython, this requires Python 2.4 (optional
 extensions are allowed to do that).
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 
 import os,re,fnmatch,sys
 
 def selflaunch(ip,line):
     """ Launch python script with 'this' interpreter
     
     e.g. d:\foo\ipykit.exe a.py
     
     """
     
     tup = line.split(None,1)
     if len(tup) == 1:
         print "Launching nested ipython session"
         os.system(sys.executable)
         return
         
     cmd = sys.executable + ' ' + tup[1]
     print ">",cmd
     os.system(cmd)
 
 class PyLauncher:
     """ Invoke selflanucher on the specified script
     
     This is mostly useful for associating with scripts using::
         _ip.defalias('foo',PyLauncher('foo_script.py'))
     
     """
     def __init__(self,script):
         self.script = os.path.abspath(script)
     def __call__(self, ip, line):
         if self.script.endswith('.ipy'):
             ip.runlines(open(self.script).read())
         else:
             # first word is the script/alias name itself, strip it
             tup = line.split(None,1)
             if len(tup) == 2:
                 tail = ' ' + tup[1]
             else:
                 tail = ''
                 
             selflaunch(ip,"py " + self.script + tail)
     def __repr__(self):
         return 'PyLauncher("%s")' % self.script
 
 def rehashdir_f(self,arg):
     """ Add executables in all specified dirs to alias table
      
     Usage:
 
     %rehashdir c:/bin;c:/tools
       - Add all executables under c:/bin and c:/tools to alias table, in 
       order to make them directly executable from any directory.
         
       Without arguments, add all executables in current directory.
       
     """
 
     # most of the code copied from Magic.magic_rehashx
 
     def isjunk(fname):
         junk = ['*~']
         for j in junk:
             if fnmatch.fnmatch(fname, j):
                 return True
         return False
     
     created = []
     if not arg:
         arg = '.'
     path = map(os.path.abspath,arg.split(';'))
     alias_table = self.shell.alias_table
         
     if os.name == 'posix':
         isexec = lambda fname:os.path.isfile(fname) and \
                  os.access(fname,os.X_OK)
     else:
 
         try:
             winext = os.environ['pathext'].replace(';','|').replace('.','')
         except KeyError:
             winext = 'exe|com|bat|py'
         if 'py' not in winext:
             winext += '|py'
             
         execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
         isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
     savedir = os.getcwd()
     try:
         # write the whole loop for posix/Windows so we don't have an if in
         # the innermost part
         if os.name == 'posix':
             for pdir in path:
                 os.chdir(pdir)
                 for ff in os.listdir(pdir):
                     if isexec(ff) and not isjunk(ff):
                         # each entry in the alias table must be (N,name),
                         # where N is the number of positional arguments of the
                         # alias.
                         src,tgt = os.path.splitext(ff)[0], os.path.abspath(ff)
                         created.append(src)                        
                         alias_table[src] = (0,tgt)
         else:
             for pdir in path:
                 os.chdir(pdir)
                 for ff in os.listdir(pdir):
                     if isexec(ff) and not isjunk(ff):
                         src, tgt = execre.sub(r'\1',ff), os.path.abspath(ff)
                         src = src.lower()
                         created.append(src)                                                
                         alias_table[src] = (0,tgt)
         # Make sure the alias table doesn't contain keywords or builtins
         self.shell.alias_table_validate()
         # Call again init_auto_alias() so we get 'rm -i' and other
         # modified aliases since %rehashx will probably clobber them
         # self.shell.init_auto_alias()
     finally:
         os.chdir(savedir)
     return created
 
 ip.expose_magic("rehashdir",rehashdir_f)

IPython/Extensions/ipy_render.py

@@ -1,68 +1,68 b''
 #!/usr/bin/env python
 
 """ IPython extension: Render templates from variables and paste to clipbard """
 
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from string import Template
 import sys,os
 
 from IPython.Itpl import itplns
 
 def toclip_w32(s):
     """ Places contents of s to clipboard
     
     Needs pyvin32 to work:
     http://sourceforge.net/projects/pywin32/
     """
     import win32clipboard as cl
     import win32con
     cl.OpenClipboard()
     cl.EmptyClipboard()
     cl.SetClipboardText( s.replace('\n','\r\n' ))
     cl.CloseClipboard()
 
 try:
     import win32clipboard    
     toclip = toclip_w32
 except ImportError:
     def toclip(s): pass
     
 
 def render(tmpl):
     """ Render a template (Itpl format) from ipython variables
 
     Example:
     
     $ import ipy_render
     $ my_name = 'Bob'  # %store this for convenience
     $ t_submission_form = "Submission report, author: $my_name"  # %store also
     $ render t_submission_form
     
     => returns "Submission report, author: Bob" and copies to clipboard on win32
 
     # if template exist as a file, read it. Note: ;f hei vaan => f("hei vaan")
     $ ;render c:/templates/greeting.txt  
     
     Template examples (Ka-Ping Yee's Itpl library):
     
     Here is a $string.
     Here is a $module.member.
     Here is an $object.member.
     Here is a $functioncall(with, arguments).
     Here is an ${arbitrary + expression}.
     Here is an $array[3] member.
     Here is a $dictionary['member'].
     """
     
     if os.path.isfile(tmpl):
         tmpl = open(tmpl).read()
         
     res = itplns(tmpl, ip.user_ns)
     toclip(res)
     return res
 
 ip.to_user_ns('render')
     
  No newline at end of file

IPython/Extensions/ipy_server.py

@@ -1,38 +1,38 b''
 """ Simple TCP socket server that executes statements in IPython instance.
 
 Usage:
 
 import ipy_server
 ipy_server.serve_thread(16455)
 
 Now, to execute the statements in this ipython instance, open a TCP socket
 (port 16455), write out the statements, and close the socket. 
 You can use e.g. "telnet localhost 16455" or a script to do this.
 
 This is a bit like 'M-x server-start" or gnuserv in the emacs world.
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import SocketServer
 
 # user-accessible port
 PORT = 8099
 
 class IPythonRequestHandler(SocketServer.StreamRequestHandler):
     def handle(self):
         #print "connection from", self.client_address
         inp = self.rfile.read().replace('\r\n','\n')
         #print "Execute",inp
         ip.runlines(inp)
 
 def serve(port = PORT):
     server = SocketServer.TCPServer(("", port), IPythonRequestHandler)
     print "ipy_server on TCP port", port
     server.serve_forever()
 
 def serve_thread(port = PORT):
     import thread
     thread.start_new_thread(serve, (port,))
  No newline at end of file

IPython/Extensions/ipy_signals.py

@@ -1,62 +1,62 b''
 """ Advanced signal (e.g. ctrl+C) handling for IPython
 
 So far, this only ignores ctrl + C in IPython file a subprocess
 is executing, to get closer to how a "proper" shell behaves.
 
 Other signal processing may be implemented later on.
 
 If _ip.options.verbose is true, show exit status if nonzero
 
 """
 
 import signal,os,sys
-import IPython.ipapi
+from IPython.core import ipapi
 import subprocess
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def new_ipsystem_posix(cmd):
     """ ctrl+c ignoring replacement for system() command in iplib.
     
     Ignore ctrl + c in IPython process during the command execution. 
     The subprocess will still get the ctrl + c signal.
     
     posix implementation
     """
     
     p =  subprocess.Popen(cmd, shell = True)
     
     old_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
     pid,status = os.waitpid(p.pid,0)
     signal.signal(signal.SIGINT, old_handler)
     if status and ip.options.verbose:
         print "[exit status: %d]" % status
     
 def new_ipsystem_win32(cmd):    
     """ ctrl+c ignoring replacement for system() command in iplib.
     
     Ignore ctrl + c in IPython process during the command execution. 
     The subprocess will still get the ctrl + c signal.
     
     win32 implementation
     """
     old_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
     status = os.system(cmd)
     signal.signal(signal.SIGINT, old_handler)
     if status and ip.options.verbose:
         print "[exit status: %d]" % status
     
     
 def init():
     o = ip.options
     try:
         o.verbose
     except AttributeError:
         o.allow_new_attr (True )
         o.verbose = 0
         
     ip.IP.system = (sys.platform == 'win32' and new_ipsystem_win32 or 
                     new_ipsystem_posix)
     
 init()
     
  No newline at end of file

IPython/Extensions/ipy_stock_completers.py

@@ -1,17 +1,17 b''
 """ Install various IPython completers
 
 IPython extension that installs completers related to core ipython behaviour.
 
 The actual implementations are in Extensions/ipy_completers.py
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from ipy_completers import *
 
 ip.set_hook('complete_command', module_completer, str_key = 'import')
 ip.set_hook('complete_command', module_completer, str_key = 'from')
 ip.set_hook('complete_command', runlistpy, str_key = '%run')
 ip.set_hook('complete_command', cd_completer, str_key = '%cd')

IPython/Extensions/ipy_synchronize_with.py

@@ -1,242 +1,242 b''
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import win32api
 import win32ui
 import win32console
 import dde
 import os
 import scitedirector
 
 # test to write.
 
 def set_hook(synchronize_with_editor):
     """Set the synchronize with editor hook with a callable object.
     
     The callable object will be called with the following arguments when
     IPython wants to synchronize with you favorite editor:
     
      - ip: a running IPython instance.
      
      - filename: the path of the file the editor is supposed to display.
      
      - lineno : the line number of the line the editor is supposed to
      highlight.
      
      - columnno : the column number of the character the editor is supposed
      to highlight.
     """
     ip.set_hook("synchronize_with_editor", synchronize_with_editor)
 
 
 def find_filename(filename):
     """Return the filename to synchronize with based on """
     filename = os.path.splitext(filename)
     if filename[1] == ".pyc":
         filename = (filename[0], ".py")
     filename = "".join(filename)
 
     if not os.path.isabs(filename):
         filename = os.path.join(os.getcwd(), filename)
 
     if os.path.isfile(filename):
         return filename
 
     return ""
 
 
 def run_command(path, command, arguments, asynchronous = True):
     """Run a shell command and return the exit code of the command"""
     # This is a thin wrapper around os.system that:
     #  - Let you run command asynchronously.
     #  - Accept spaces in command path.
     #  - Dont throw exception if the command don't exist.
     line = ''
     if asynchronous:
         line += 'start '
         
     try:
         line += win32api.GetShortPathName(os.path.join(path, command) + ".exe") + " "
     except:
         print 'could not find: "%s"' % (os.path.join(path, command) + ".exe")
         return -1
         
     line += arguments
     r = os.system(line)
     return r
 
 
 def sleep(milliseconds):
     """Wait some milliseconds."""
     # This is used to make sure the editor did its job before we reset the focus on the console.
     win32api.Sleep(milliseconds)
 
 
 def restore_console_focus():
     """Restore the focus to the IPython console."""
     h = win32console.GetConsoleWindow()
     console_window = win32ui.CreateWindowFromHandle(h)
     console_window.SetForegroundWindow()
     
 
 # This is the most simple example of hook:
 class GVimHook:
     def __init__(self, path, wakeup_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         run_command(self.path, 'gvim', '--remote-silent +%d "%s"' % (lineno, filename))
 
         sleep(self.wakeup_duration)
 
         restore_console_focus()
 
 
 def gvim(path = r"C:\Program Files\vim\vim71", wakeup_duration = 100):
     synchronize_with_editor = GVimHook(path, wakeup_duration)
     set_hook(synchronize_with_editor)
 
 
 class EmacsHook:
     def __init__(self, path, wakeup_duration, start_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
         self.start_duration = start_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         r = run_command(self.path, "emacsclient", '-n +%d:%d "%s" 2>nul' % (lineno, columnno, filename), False)
         if r != 0:
             run_command(self.path, 'runemacs', '--quick -f server-start +%d:%d "%s"' % (lineno, columnno, filename))
             sleep(self.start_duration)
         else:
             sleep(self.wakeup_duration)
 
         restore_console_focus()
 
 
 def emacs(path = r"C:\Program Files\emacs\bin", wakeup_duration = 100, start_duration = 2000):
     synchronize_with_editor = EmacsHook(path, wakeup_duration, start_duration)
     set_hook(synchronize_with_editor)
 
 
 class SciteHook:
     def __init__(self, path, wakeup_duration, start_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
         self.start_duration = start_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         scites = scitedirector.findWindows()
         if not scites:
             run_command(self.path, "scite", '"-open:%s" -goto:%d' % (filename.replace("\\", "/"), lineno))
 
             sleep(self.start_duration)
             restore_console_focus()
         else:
             scite = scites[0]
             scitedirector.sendCommand(scite, 'open:%s' % filename.replace("\\", "/"))
             scitedirector.sendCommand(scite, "goto:%d" % lineno)
 
 
 def scite(path = r"C:\Program Files\SciTE Source Code Editor", wakeup_duration = 100, start_duration = 500):
     synchronize_with_editor = SciteHook(path, wakeup_duration, start_duration)
     set_hook(synchronize_with_editor)
 
 
 class NodePadPlusPlusHook:
     def __init__(self, path, wakeup_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         run_command(self.path, "notepad++", '"%s" -n%d' % (filename, lineno))
 
         sleep(self.wakeup_duration)
 
         restore_console_focus()
 
 
 def notepadplusplus(path = r"C:\Program Files\Notepad++", wakeup_duration = 100):
     synchronize_with_editor = NodePadPlusPlusHook(path, wakeup_duration)
     set_hook(synchronize_with_editor)
 
 
 class PsPadHook:
     def __init__(self, path, wakeup_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         run_command(self.path, "pspad", '"%s" -%d' % (filename, lineno))
 
         sleep(self.wakeup_duration)
 
         restore_console_focus()
 
 
 def pspad(path = r"C:\Program Files\PSPad editor", wakeup_duration = 100):
     synchronize_with_editor = PsPadHook(path, wakeup_duration)
     set_hook(synchronize_with_editor)
 
 
 # This is an example of DDE hook:
 class UltraEditHook:
     def __init__(self, path, wakeup_duration, start_duration):
         self.path = path
         self.wakeup_duration = wakeup_duration
         self.start_duration = start_duration
 
     def __call__(self, ip, filename, lineno, columnno):
         filename = find_filename(filename)
 
         if not filename:
             return
 
         server = dde.CreateServer()
         server.Create("myddeserver")
         conversation = dde.CreateConversation(server)
         try:
             conversation.ConnectTo("uedit32", "System")
             conversation.Exec(r'[open("%s/%d"])' % (filename, lineno))
             
             sleep(self.wakeup_duration)
         except:
             run_command(self.path, 'uedit32', '"%s/%d"' % (filename, lineno))
             
             sleep(self.start_duration)
 
         server.Shutdown()
 
         restore_console_focus()
 
 
 def ultraedit(path = r"C:\Program Files\IDM Computer Solutions\UltraEdit-32", wakeup_duration = 10, start_duration = 2000):
     synchronize_with_editor = UltraEditHook(path, wakeup_duration, start_duration)
     set_hook(synchronize_with_editor)
     
  No newline at end of file

IPython/Extensions/ipy_system_conf.py

@@ -1,24 +1,24 b''
 """ System wide configuration file for IPython.
 
 This will be imported by ipython for all users.
 
 After this ipy_user_conf.py is imported, user specific configuration
 should reside there. 
 
  """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 # add system wide configuration information, import extensions etc. here.
 # nothing here is essential 
 
 import sys
 
 import ext_rescapture # var = !ls and var = %magic
 import pspersistence # %store magic
 import clearcmd # %clear
 
 import ipy_stock_completers
 
 ip.load('IPython.core.history')

IPython/Extensions/ipy_traits_completer.py

@@ -1,184 +1,184 b''
 """Traits-aware tab completion.
 
 This module provides a custom tab-completer that intelligently hides the names
 that the enthought.traits library (http://code.enthought.com/traits)
 automatically adds to all objects that inherit from its base HasTraits class.
 
 
 Activation
 ==========
 
 To use this, put in your ~/.ipython/ipy_user_conf.py file:
 
     from ipy_traits_completer import activate
     activate([complete_threshold])
 
 The optional complete_threshold argument is the minimal length of text you need
 to type for tab-completion to list names that are automatically generated by
 traits.  The default value is 3.  Note that at runtime, you can change this
 value simply by doing:
 
     import ipy_traits_completer
     ipy_traits_completer.COMPLETE_THRESHOLD = 4
 
 
 Usage
 =====
 
 The system works as follows.  If t is an empty object that HasTraits, then
 (assuming the threshold is at the default value of 3):
 
 In [7]: t.ed<TAB>
 
 doesn't show anything at all, but:
 
 In [7]: t.edi<TAB>
 t.edit_traits      t.editable_traits
 
 shows these two names that come from traits.  This allows you to complete on
 the traits-specific names by typing at least 3 letters from them (or whatever
 you set your threshold to), but to otherwise not see them in normal completion.
 
 
 Notes
 =====
 
   - This requires Python 2.4 to work (I use sets).  I don't think anyone is
   using traits with 2.3 anyway, so that's OK.
 """
 
 #############################################################################
 # External imports
 from enthought.traits import api as T
 
 # IPython imports
-from IPython.ipapi import TryNext, get as ipget
+from IPython.core.ipapi import TryNext, get as ipget
 from IPython.utils.genutils import dir2
 try:
     set
 except:
     from sets import Set as set
 
 #############################################################################
 # Module constants
 
 # The completion threshold
 # This is currently implemented as a module global, since this sytem isn't
 # likely to be modified at runtime by multiple instances.  If needed in the
 # future, we can always make it local to the completer as a function attribute.
 COMPLETE_THRESHOLD = 3
 
 # Set of names that Traits automatically adds to ANY traits-inheriting object.
 # These are the names we'll filter out.
 TRAIT_NAMES = set( dir2(T.HasTraits()) ) - set( dir2(object()) )
 
 #############################################################################
 # Code begins
 
 def trait_completer(self,event):
     """A custom IPython tab-completer that is traits-aware.
 
     It tries to hide the internal traits attributes, and reveal them only when
     it can reasonably guess that the user really is after one of them.
     """
     
     #print '\nevent is:',event  # dbg
     symbol_parts = event.symbol.split('.')
     base = '.'.join(symbol_parts[:-1])
     #print 'base:',base  # dbg
 
     oinfo = self._ofind(base)
     if not oinfo['found']:
         raise TryNext
 
     obj = oinfo['obj']
     # OK, we got the object.  See if it's traits, else punt
     if not isinstance(obj,T.HasTraits):
         raise TryNext
 
     # it's a traits object, don't show the tr* attributes unless the completion
     # begins with 'tr'
     attrs = dir2(obj)
     # Now, filter out the attributes that start with the user's request
     attr_start = symbol_parts[-1]
     if attr_start:
         attrs = [a for a in attrs if a.startswith(attr_start)]
     
     # Let's also respect the user's readline_omit__names setting:
     omit__names = ipget().options.readline_omit__names
     if omit__names == 1:
         attrs = [a for a in attrs if not a.startswith('__')]
     elif omit__names == 2:
         attrs = [a for a in attrs if not a.startswith('_')]
 
     #print '\nastart:<%r>' % attr_start  # dbg
 
     if len(attr_start)<COMPLETE_THRESHOLD:
         attrs = list(set(attrs) - TRAIT_NAMES)
         
     # The base of the completion, so we can form the final results list
     bdot = base+'.'
 
     tcomp = [bdot+a for a in attrs]
     #print 'tcomp:',tcomp
     return tcomp
 
 def activate(complete_threshold = COMPLETE_THRESHOLD):
     """Activate the Traits completer.
 
     :Keywords:
       complete_threshold : int
         The minimum number of letters that a user must type in order to
       activate completion of traits-private names."""
     
     if not (isinstance(complete_threshold,int) and
             complete_threshold>0):
         e='complete_threshold must be a positive integer, not %r'  % \
            complete_threshold
         raise ValueError(e)
 
     # Set the module global
     global COMPLETE_THRESHOLD
     COMPLETE_THRESHOLD = complete_threshold
 
     # Activate the traits aware completer
     ip = ipget()
     ip.set_hook('complete_command', trait_completer, re_key = '.*')
 
 
 #############################################################################
 if __name__ == '__main__':
     # Testing/debugging
 
     # A sorted list of the names we'll filter out
     TNL = list(TRAIT_NAMES)
     TNL.sort()
 
     # Make a few objects for testing
     class TClean(T.HasTraits): pass
     class Bunch(object): pass
     # A clean traits object
     t = TClean()
     # A nested object containing t
     f = Bunch()
     f.t = t
     # And a naked new-style object
     o = object()
 
     ip = ipget().IP
     
     # A few simplistic tests
 
     # Reset the threshold to the default, in case the test is running inside an
     # instance of ipython that changed it
     import ipy_traits_completer
     ipy_traits_completer.COMPLETE_THRESHOLD = 3
 
     assert ip.complete('t.ed') ==[]
 
     # For some bizarre reason, these fail on the first time I run them, but not
     # afterwards.  Traits does some really weird stuff at object instantiation
     # time...
     ta = ip.complete('t.edi')
     assert ta == ['t.edit_traits', 't.editable_traits']
     print 'Tests OK'

IPython/Extensions/ipy_vimserver.py

@@ -1,239 +1,239 b''
 """ Integration with gvim, by Erich Heine
 
 Provides a %vim magic command, and reuses the same vim session. Uses 
 unix domain sockets for communication between vim and IPython. ipy.vim is 
 available in doc/examples of the IPython distribution.
 
 Slightly touched up email announcement (and description how to use it) by 
 Erich Heine is here:
 
 Ive recently been playing with ipython, and like it quite a bit. I did
 however discover a bit of frustration, namely with editor interaction.
 I am a gvim user, and using the command edit on a new file causes
 ipython to try and run that file as soon as the text editor opens
 up. The -x command of course fixes this, but its still a bit annoying,
 switching windows to do a run file, then back to the text
 editor. Being a heavy tab user in gvim, another annoyance is not being
 able to specify weather a new tab is how I choose to open the file.
 
 Not being one to shirk my open source duties (and seeing this as a
 good excuse to poke around ipython internals), Ive created a script
 for having gvim and ipython work very nicely together. Ive attached
 both to this email (hoping of course that the mailing list allows such
 things).
 
 There are 2 files: 
 
 ipy_vimserver.py -- this file contains the ipython stuff
 ipy.vim -- this file contains the gvim stuff
 
 In combination they allow for a few functionalities:
 
 #1. the vim magic command. This is a fancy wrapper around the edit
 magic, that allows for a new option, -t, which opens the text in a new
 gvim tab.  Otherwise it works the same as edit -x. (it internally
 calls edit -x). This magic command also juggles vim server management,
 so when it is called when there is not a gvim running, it creates a
 new gvim instance, named after the ipython session name.  Once such a
 gvim instance is running, it will be used for subsequent uses of the
 vim command.
 
 #2. ipython - gvim interaction. Once a file has been opened with the
 vim magic (and a session set up, see below), pressing the F5 key in
 vim will cause the calling ipython instance to execute run
 filename.py. (if you typo like I do, this is very useful)
 
 #3. ipython server - this is a thread wich listens on a unix domain
 socket, and runs commands sent to that socket.
 
 Note, this only works on POSIX systems, that allow for AF_UNIX type
 sockets. It has only been tested on linux (a fairly recent debian
 testing distro).
 
 To install it put, the ipserver.py in your favorite locaion for
 sourcing ipython scripts. I put the ipy.vim in
 ~/.vim/after/ftplugin/python/.
 
 To use (this can be scripted im sure, but i usually have 2 or 3
 ipythons and corresponding gvims open):
 
 import ipy_vimserver
 ipy_vimserver.setup('sessionname')
 
 (Editors note - you can probably add these to your ipy_user_conf.py)
 
 Then use ipython as you normally would, until you need to edit
 something. Instead of edit, use the vim magic.  Thats it!
 
 """
 
-import IPython.ipapi
-#import ipythonhooks
+from IPython.core import ipapi
+
 import socket, select
 import os, threading, subprocess
 import re
 
 ERRCONDS = select.POLLHUP|select.POLLERR
 SERVER = None
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 # this listens to a unix domain socket in a separate thread, so that comms
 # between a vim instance and ipython can happen in a fun and productive way
 class IpyServer(threading.Thread):
     def __init__(self, sname):
         super(IpyServer, self).__init__()
         self.keep_running = True
         self.__sname = sname
         self.socket = socket.socket(socket.AF_UNIX)
         self.poller = select.poll()
         self.current_conns = dict()
         self.setDaemon(True)
 
     def listen(self):
         self.socket.bind(self.__sname)
         self.socket.listen(1)
 
     def __handle_error(self, socket):
         if socket == self.socket.fileno():
             self.keep_running = False
             for a in self.current_conns.values():
                 a.close()
             return False
         else:
             y = self.current_conns[socket]
             del self.current_conns[socket]
         y.close()
         self.poller.unregister(socket)
 
     def serve_me(self):
         self.listen()
         self.poller.register(self.socket,select.POLLIN|ERRCONDS)
 
         while self.keep_running:
             try:
                 avail = self.poller.poll(1)
             except:
                 continue
 
             if not avail: continue
 
             for sock, conds in avail:
                 if conds & (ERRCONDS):
                     if self.__handle_error(sock): continue
                     else: break
 
                 if sock == self.socket.fileno():
                     y = self.socket.accept()[0]
                     self.poller.register(y, select.POLLIN|ERRCONDS)
                     self.current_conns[y.fileno()] = y
                 else: y = self.current_conns.get(sock)
 
                 self.handle_request(y)
 
         os.remove(self.__sname)
 
     run = serve_me
 
     def stop(self):
         self.keep_running = False
 
     def handle_request(self,sock):
         sock.settimeout(1)
         while self.keep_running:
             try:
                 x = sock.recv(4096)
             except socket.timeout:
                 pass
             else:
                 break
         self.do_it(x)
 
     def do_it(self, data):
         data = data.split('\n')
         cmds = list()
         for line in data:
             cmds.append(line)
         ip.runlines(cmds)
 
 
 # try to help ensure that the unix domain socket is cleaned up proper
 def shutdown_server(self):
     if SERVER:
         SERVER.stop()
         SERVER.join(3)
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 ip.set_hook('shutdown_hook', shutdown_server, 10)
 
 # this fun function exists to make setup easier for all, and makes the
 # vimhook function ready for instance specific communication
 def setup(sessionname='',socketdir=os.path.expanduser('~/.ipython/')):
     global SERVER
 
     if sessionname:
         session = sessionname
     elif os.environ.get('IPY_SESSION'):
         session = os.environ.get('IPY_SESSION')
     else:
         session = 'IPYS'
     vimhook.vimserver=session
     vimhook.ipyserver = os.path.join(socketdir, session)
     if not SERVER:
         SERVER = IpyServer(vimhook.ipyserver)
         SERVER.start()
 
 
 
 # calls gvim, with all ops happening on the correct gvim instance for this
 # ipython instance. it then calls edit -x (since gvim will return right away)
 # things of note: it sets up a special environment, so that the ipy.vim script
 # can connect back to the ipython instance and do fun things, like run the file
 def vimhook(self, fname, line):
     env = os.environ.copy()
     vserver = vimhook.vimserver.upper()
     check = subprocess.Popen('gvim --serverlist', stdout = subprocess.PIPE,
         shell=True)
     check.wait()
     cval = [l for l in check.stdout.readlines() if vserver in l]
 
     if cval:
         vimargs = '--remote%s' % (vimhook.extras,)
     else:
         vimargs = ''
     vimhook.extras = ''
 
     env['IPY_SESSION'] = vimhook.vimserver
     env['IPY_SERVER'] = vimhook.ipyserver
 
     if line is None: line = ''
     else: line = '+' + line
     vim_cmd = 'gvim --servername %s %s %s %s' % (vimhook.vimserver, vimargs,
         line, fname)
     subprocess.call(vim_cmd, env=env, shell=True)
 
 
 #default values to keep it sane...
 vimhook.vimserver = ''
 vimhook.ipyserver = ''
 
 ip.set_hook('editor',vimhook)
 
 # this is set up so more vim specific commands can be added, instead of just
 # the current -t. all thats required is a compiled regex, a call to do_arg(pat)
 # and the logic to deal with the new feature
 newtab = re.compile(r'-t(?:\s|$)')
 def vim(self, argstr):
     def do_arg(pat, rarg):
         x = len(pat.findall(argstr))
         if x:
             a = pat.sub('',argstr)
             return rarg, a
         else: return '', argstr
 
     t, argstr = do_arg(newtab, '-tab')
     vimhook.extras = t
     argstr = 'edit -x ' + argstr
     ip.magic(argstr)
 
 ip.expose_magic('vim', vim)
 

IPython/Extensions/ipy_which.py

@@ -1,76 +1,76 b''
 r""" %which magic command
 
 %which <cmd> => search PATH for files matching PATH. Also scans aliases
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 from fnmatch import fnmatch
 def which(fname):
     fullpath = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
     
     if '.' not in fullpath:
         fullpath = ['.'] + fullpath
     fn = fname
     for p in fullpath:
         for f in os.listdir(p):
             head, ext = os.path.splitext(f)
             if f == fn or fnmatch(head, fn):
                 yield os.path.join(p,f)
     return
 
 def which_alias(fname):
     for al, tgt in ip.IP.alias_table.items():
         if not (al == fname or fnmatch(al, fname)):
             continue
         if callable(tgt):
             print "Callable alias",tgt
             d = tgt.__doc__
             if d:
                 print "Docstring:\n",d
                 continue
         trg = tgt[1]
         
         trans = ip.expand_alias(trg)
         cmd = trans.split(None,1)[0]
         print al,"->",trans
         for realcmd in which(cmd):
             print "  ==",realcmd
         
 def which_f(self, arg):
     r""" %which <cmd> => search PATH for files matching cmd. Also scans aliases.
 
     Traverses PATH and prints all files (not just executables!) that match the
     pattern on command line. Probably more useful in finding stuff
     interactively than 'which', which only prints the first matching item.
     
     Also discovers and expands aliases, so you'll see what will be executed
     when you call an alias.
     
     Example:
     
     [~]|62> %which d
     d -> ls -F --color=auto
       == c:\cygwin\bin\ls.exe
     c:\cygwin\bin\d.exe
     
     [~]|64> %which diff*
     diff3 -> diff3
       == c:\cygwin\bin\diff3.exe
     diff -> diff
       == c:\cygwin\bin\diff.exe
     c:\cygwin\bin\diff.exe
     c:\cygwin\bin\diff3.exe
 
     """
     
     which_alias(arg)
 
     for e in which(arg):
         print e
     
 ip.expose_magic("which",which_f)        
         

IPython/Extensions/ipy_winpdb.py

@@ -1,83 +1,83 b''
 """ Debug a script (like %run -d) in IPython process, Using WinPdb
 
 Usage:
 
 %wdb test.py
     run test.py, with a winpdb breakpoint at start of the file 
     
 %wdb pass
     Change the password (e.g. if you have forgotten the old one)
 
 
 Notes
 -----
 
 **WARNING**: As of March 2009 (IPython 0.10), WinPdb has a known bug, which
 causes PyTables to become impossible to import if winpdb is loaded.  Therefore,
 if you need PyTables, do *not* use this extension.
 
 For more details: https://bugs.launchpad.net/ipython/+bug/249036
 """
 
 import os
 
-import IPython.ipapi
+from IPython.core import ipapi
 import rpdb2
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 rpdb_started = False
 
 def wdb_f(self, arg):
     """ Debug a script (like %run -d) in IPython process, Using WinPdb
     
     Usage:
     
     %wdb test.py
         run test.py, with a winpdb breakpoint at start of the file 
         
     %wdb pass
         Change the password (e.g. if you have forgotten the old one)
         
     Note that after the script has been run, you need to do "Go" (f5) 
     in WinPdb to resume normal IPython operation.
     """
 
     global rpdb_started
     if not arg.strip():
         print __doc__
         return
         
     if arg.strip() == 'pass':
         passwd = raw_input('Enter new winpdb session password: ')
         ip.db['winpdb_pass'] = passwd
         print "Winpdb password changed"
         if rpdb_started:
             print "You need to restart IPython to use the new password"
         return 
     
     path = os.path.abspath(arg)
     if not os.path.isfile(path):
-        raise IPython.ipapi.UsageError("%%wdb: file %s does not exist" % path)
+        raise ipapi.UsageError("%%wdb: file %s does not exist" % path)
     if not rpdb_started:
         passwd = ip.db.get('winpdb_pass', None)
         if passwd is None:
             import textwrap
             print textwrap.dedent("""\
             Winpdb sessions need a password that you use for attaching the external
             winpdb session. IPython will remember this. You can change the password later 
             by '%wpdb pass'
             """)
             passwd = raw_input('Enter new winpdb session password: ')
             ip.db['winpdb_pass'] = passwd
             
         print "Starting rpdb2 in IPython process"
         rpdb2.start_embedded_debugger(passwd, timeout = 0)
         rpdb_started = True
         
     rpdb2.set_temp_breakpoint(path)
     print 'It is time to attach with WinPdb (launch WinPdb if needed, File -> Attach)'
     ip.magic('%run ' + arg)
     
 
 ip.expose_magic('wdb', wdb_f)

IPython/Extensions/ipy_workdir.py

@@ -1,43 +1,43 b''
 #!/usr/bin/env python
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os, subprocess
 
 workdir = None
 def workdir_f(ip,line):
     """ Exceute commands residing in cwd elsewhere 
     
     Example::
       
       workdir /myfiles
       cd bin
       workdir myscript.py 
       
     executes myscript.py (stored in bin, but not in path) in /myfiles
     """
     global workdir
     dummy,cmd  = line.split(None,1)
     if os.path.isdir(cmd):
         workdir = os.path.abspath(cmd)
         print "Set workdir",workdir
     elif workdir is None:
         print "Please set workdir first by doing e.g. 'workdir q:/'"
     else:
         sp = cmd.split(None,1)
         if len(sp) == 1:
             head, tail = cmd, ''
         else:
             head, tail = sp
         if os.path.isfile(head):
             cmd = os.path.abspath(head) + ' ' + tail
         print "Execute command '" + cmd+ "' in",workdir
         olddir = os.getcwd()
         os.chdir(workdir)
         try:
             os.system(cmd)
         finally:
             os.chdir(olddir)
 
 ip.defalias("workdir",workdir_f)

IPython/Extensions/jobctrl.py

@@ -1,242 +1,242 b''
 """ Preliminary "job control" extensions for IPython 
 
 requires python 2.4 (or separate 'subprocess' module
 
 This provides 2 features, launching background jobs and killing foreground jobs from another IPython instance.
 
 Launching background jobs:
 
     Usage:
 
     [ipython]|2> import jobctrl
     [ipython]|3> &ls
              <3> <jobctrl.IpyPopen object at 0x00D87FD0>
     [ipython]|4> _3.go
     -----------> _3.go()
     ChangeLog
     IPython
     MANIFEST.in
     README
     README_Windows.txt
 
     ...
 
 Killing foreground tasks:
 
 Launch IPython instance, run a blocking command:
 
     [Q:/ipython]|1> import jobctrl
     [Q:/ipython]|2> cat
 
 Now launch a new IPython prompt and kill the process:
 
     IPython 0.8.3.svn.r2919   [on Py 2.5]
     [Q:/ipython]|1> import jobctrl
     [Q:/ipython]|2> %tasks
     6020: 'cat ' (Q:\ipython)
     [Q:/ipython]|3> %kill
     SUCCESS: The process with PID 6020 has been terminated.
     [Q:/ipython]|4>
 
 (you don't need to specify PID for %kill if only one task is running)
 """                     
 
 from subprocess import *
 import os,shlex,sys,time
 import threading,Queue
 
 from IPython.utils import genutils
 
-import IPython.ipapi
+from IPython.core import ipapi
 
 if os.name == 'nt':
     def kill_process(pid):
         os.system('taskkill /F /PID %d' % pid)
 else:
     def kill_process(pid):
         os.system('kill -9 %d' % pid)
     
     
 
 class IpyPopen(Popen):
     def go(self):
         print self.communicate()[0]
     def __repr__(self):
         return '<IPython job "%s" PID=%d>' % (self.line, self.pid)
 
     def kill(self):
         kill_process(self.pid)
                   
 def startjob(job):
     p = IpyPopen(shlex.split(job), stdout=PIPE, shell = False)
     p.line = job
     return p
 
 class AsyncJobQ(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
         self.q = Queue.Queue()
         self.output = []
         self.stop = False
     def run(self):
         while 1:
             cmd,cwd = self.q.get()
             if self.stop:
                 self.output.append("** Discarding: '%s' - %s" % (cmd,cwd))
                 continue
             self.output.append("** Task started: '%s' - %s" % (cmd,cwd))
             
             p = Popen(cmd, shell=True, stdout=PIPE, stderr=STDOUT, cwd = cwd)
             out = p.stdout.read()
             self.output.append("** Task complete: '%s'\n" % cmd)
             self.output.append(out)
 
     def add(self,cmd):
         self.q.put_nowait((cmd, os.getcwd()))
         
     def dumpoutput(self):
         while self.output:
             item = self.output.pop(0)
             print item            
 
 _jobq = None
 
 def jobqueue_f(self, line):
      
     global _jobq
     if not _jobq:
         print "Starting jobqueue - do '&some_long_lasting_system_command' to enqueue"
         _jobq = AsyncJobQ()
         _jobq.setDaemon(True)
         _jobq.start()
         ip.jobq = _jobq.add
         return
     if line.strip() == 'stop':
         print "Stopping and clearing jobqueue, %jobqueue start to start again"
         _jobq.stop = True
         return
     if line.strip() == 'start':
         _jobq.stop = False
         return
         
 def jobctrl_prefilter_f(self,line):    
     if line.startswith('&'):
         pre,fn,rest = self.split_user_input(line[1:])
         
         line = ip.IP.expand_aliases(fn,rest)
         if not _jobq:
             return '_ip.startjob(%s)' % genutils.make_quoted_expr(line)
         return '_ip.jobq(%s)' % genutils.make_quoted_expr(line)
 
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 def jobq_output_hook(self):
     if not _jobq:
         return
     _jobq.dumpoutput()
 
 
 
 def job_list(ip):
     keys = ip.db.keys('tasks/*')
     ents = [ip.db[k] for k in keys]
     return ents
 
 def magic_tasks(self,line):
     """ Show a list of tasks.
 
     A 'task' is a process that has been started in IPython when 'jobctrl' extension is enabled.
     Tasks can be killed with %kill.
     
     '%tasks clear' clears the task list (from stale tasks)
     """
     ip = self.getapi()
     if line.strip() == 'clear':
         for k in ip.db.keys('tasks/*'):
             print "Clearing",ip.db[k]
             del ip.db[k]
         return
         
     ents = job_list(ip)
     if not ents:
         print "No tasks running"
     for pid,cmd,cwd,t in ents:
         dur = int(time.time()-t)
         print "%d: '%s' (%s) %d:%02d" % (pid,cmd,cwd, dur / 60,dur%60)
 
 def magic_kill(self,line):
     """ Kill a task
 
     Without args, either kill one task (if only one running) or show list (if many)
     With arg, assume it's the process id.
 
     %kill is typically (much) more powerful than trying to terminate a process with ctrl+C.
     """
     ip = self.getapi()
     jobs  = job_list(ip)
 
     if not line.strip():
         if len(jobs) == 1:
             kill_process(jobs[0][0])
         else:
             magic_tasks(self,line)
         return
         
     try:
         pid = int(line)
         kill_process(pid)
     except ValueError:
         magic_tasks(self,line)
         
 if sys.platform == 'win32':
     shell_internal_commands = 'break chcp cls copy ctty date del erase dir md mkdir path prompt rd rmdir start time type ver vol'.split()
     PopenExc = WindowsError
 else:
     # todo linux commands
     shell_internal_commands = [] 
     PopenExc = OSError
 
 
 def jobctrl_shellcmd(ip,cmd):
     """ os.system replacement that stores process info to db['tasks/t1234'] """
     cmd = cmd.strip()
     cmdname = cmd.split(None,1)[0]
     if cmdname in shell_internal_commands or '|' in cmd or '>' in cmd or '<' in cmd:
         use_shell = True
     else:
         use_shell = False
 
     jobentry = None
     try:
         try:
             p = Popen(cmd,shell = use_shell)
         except PopenExc :
             if use_shell:
                 # try with os.system
                 os.system(cmd)
                 return
             else:
                 # have to go via shell, sucks
                 p = Popen(cmd,shell = True)
             
         jobentry = 'tasks/t' + str(p.pid)
         ip.db[jobentry] = (p.pid,cmd,os.getcwd(),time.time())
         p.communicate()        
 
     finally:
         if jobentry:
             del ip.db[jobentry]
 
 
 def install():
     global ip
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
     # needed to make startjob visible as _ip.startjob('blah')
     ip.startjob = startjob
     ip.set_hook('input_prefilter', jobctrl_prefilter_f)
     ip.set_hook('shell_hook', jobctrl_shellcmd)
     ip.expose_magic('kill',magic_kill)
     ip.expose_magic('tasks',magic_tasks)
     ip.expose_magic('jobqueue',jobqueue_f)
     ip.set_hook('pre_prompt_hook', jobq_output_hook) 
 install()

IPython/Extensions/ledit.py

@@ -1,98 +1,98 b''
 """ Fun magic line editor for ipython 
 
 Use this to easily edit lists of strings gradually without crafting long 
 list comprehensions.
 
 'l' is the magic variable name for every line (array element). Save the current 
 result (or more exactly, retrieve the last ipython computation result into
 %led work area) by running '%led s'. Just run '%led' to show the current work
 area data.
 
 Example use:
 
 [ipython]|25> setups = !ls *setup*.py
  ==
 ['eggsetup.py', 'setup.py', 'setup_bdist_egg.py']
 [ipython]|26> setups
          <26> ['eggsetup.py', 'setup.py', 'setup_bdist_egg.py']
 [ipython]|27> %led s
 Data set from last result (_)
          <27> ['eggsetup.py', 'setup.py', 'setup_bdist_egg.py']
 [ipython]|28> %led upper
 cmd translated => l.upper()
          <28> ['EGGSETUP.PY', 'SETUP.PY', 'SETUP_BDIST_EGG.PY']
 [ipython]|29> %led
 Magic line editor (for lists of strings)
 current data is:
 ['eggsetup.py', 'setup.py', 'setup_bdist_egg.py']
 [ipython]|30> %led upper
 cmd translated => l.upper()
          <30> ['EGGSETUP.PY', 'SETUP.PY', 'SETUP_BDIST_EGG.PY']
 [ipython]|31> %led s
 Data set from last result (_)
          <31> ['EGGSETUP.PY', 'SETUP.PY', 'SETUP_BDIST_EGG.PY']
 [ipython]|32> %led "n:" + l
          <32> ['n:EGGSETUP.PY', 'n:SETUP.PY', 'n:SETUP_BDIST_EGG.PY']
 [ipython]|33> %led s
 Data set from last result (_)
          <33> ['n:EGGSETUP.PY', 'n:SETUP.PY', 'n:SETUP_BDIST_EGG.PY']
 [ipython]|34> %led l.
 l.__add__          l.__gt__           l.__reduce_ex__    l.endswith         l.join             l.rstrip
 l.__class__        l.__hash__         l.__repr__         l.expandtabs       l.ljust            l.split
 
 ... (completions for string variable shown ) ...
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 import pprint
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 curdata = []
 
 def line_edit_f(self, cmd ):
     global curdata
     
     if not cmd:
         
         print "Magic line editor (for lists of strings)"
         if curdata:
             print "current data is:"
             pprint.pprint(curdata)
         else:
             print "No current data, you should set it by running '%led s'"
             print "When you have your data in _ (result of last computation)."
         return
         
     if cmd == 's':
         curdata = ip.ev('_')
         print "Data set from last result (_)"
         newlines = curdata
         
     else:
         # simple method call, e.g. upper
         if cmd.isalpha():
             cmd = 'l.' + cmd + '()'
             print "cmd translated =>",cmd
 
         newlines = []
         for l in curdata:
             try:
                 l2 = eval(cmd)
             except Exception,e:
                 print "Dropping exception",e,"on line:",l
                 continue
             newlines.append(l2)
 
     
     return newlines
 
 def line_edit_complete_f(self,event):
     """ Show all string methods in completions """
     if event.symbol.startswith('l.'):
         return ['l.' + func for func in dir('')]
     
     return dir('') + ['l.' + func for func in dir('')]
 
 ip.set_hook('complete_command', line_edit_complete_f , str_key = '%led')
         
 ip.expose_magic('led', line_edit_f)
  No newline at end of file

IPython/Extensions/pspersistence.py

@@ -1,182 +1,182 b''
 # -*- coding: utf-8 -*-
 """
 %store magic for lightweight persistence.
 
 Stores variables, aliases etc. in PickleShare database.
 """
 
-import IPython.ipapi
-from IPython.ipapi import UsageError
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+from IPython.core.ipapi import UsageError
+ip = ipapi.get()
 
 import pickleshare
 
 import inspect,pickle,os,sys,textwrap
 from IPython.core.fakemodule import FakeModule
 
 def restore_aliases(self):
     ip = self.getapi()
     staliases = ip.db.get('stored_aliases', {})
     for k,v in staliases.items():
         #print "restore alias",k,v # dbg
         #self.alias_table[k] = v
         ip.defalias(k,v)
 
 
 def refresh_variables(ip):
     db = ip.db
     for key in db.keys('autorestore/*'):
         # strip autorestore
         justkey = os.path.basename(key)
         try:
             obj = db[key]
         except KeyError:
             print "Unable to restore variable '%s', ignoring (use %%store -d to forget!)" % justkey
             print "The error was:",sys.exc_info()[0]
         else:
             #print "restored",justkey,"=",obj #dbg
             ip.user_ns[justkey] = obj
     
 
 def restore_dhist(ip):
     db = ip.db
     ip.user_ns['_dh'] = db.get('dhist',[])
     
 def restore_data(self):
     ip = self.getapi()
     refresh_variables(ip)
     restore_aliases(self)
     restore_dhist(self)
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
     
 ip.set_hook('late_startup_hook', restore_data)
 
 def magic_store(self, parameter_s=''):
     """Lightweight persistence for python variables.
 
     Example:
     
     ville@badger[~]|1> A = ['hello',10,'world']\\
     ville@badger[~]|2> %store A\\
     ville@badger[~]|3> Exit
     
     (IPython session is closed and started again...)
     
     ville@badger:~$ ipython -p pysh\\
     ville@badger[~]|1> print A
     
     ['hello', 10, 'world']
     
     Usage:
     
     %store          - Show list of all variables and their current values\\
     %store <var>    - Store the *current* value of the variable to disk\\
     %store -d <var> - Remove the variable and its value from storage\\
     %store -z       - Remove all variables from storage\\
     %store -r       - Refresh all variables from store (delete current vals)\\
     %store foo >a.txt  - Store value of foo to new file a.txt\\
     %store foo >>a.txt - Append value of foo to file a.txt\\   
     
     It should be noted that if you change the value of a variable, you
     need to %store it again if you want to persist the new value.
     
     Note also that the variables will need to be pickleable; most basic
     python types can be safely %stored.
     
     Also aliases can be %store'd across sessions.
     """
     
     opts,argsl = self.parse_options(parameter_s,'drz',mode='string')
     args = argsl.split(None,1)
     ip = self.getapi()
     db = ip.db
     # delete
     if opts.has_key('d'):
         try:
             todel = args[0]
         except IndexError:
             raise UsageError('You must provide the variable to forget')
         else:
             try:
                 del db['autorestore/' + todel]
             except:
                 raise UsageError("Can't delete variable '%s'" % todel)
     # reset
     elif opts.has_key('z'):
         for k in db.keys('autorestore/*'):
             del db[k]
 
     elif opts.has_key('r'):
         refresh_variables(ip)
 
     
     # run without arguments -> list variables & values
     elif not args:
         vars = self.db.keys('autorestore/*')
         vars.sort()            
         if vars:
             size = max(map(len,vars))
         else:
             size = 0
             
         print 'Stored variables and their in-db values:'
         fmt = '%-'+str(size)+'s -> %s'
         get = db.get
         for var in vars:
             justkey = os.path.basename(var)
             # print 30 first characters from every var
             print fmt % (justkey,repr(get(var,'<unavailable>'))[:50])
     
     # default action - store the variable
     else:
         # %store foo >file.txt or >>file.txt
         if len(args) > 1 and args[1].startswith('>'):
             fnam = os.path.expanduser(args[1].lstrip('>').lstrip())
             if args[1].startswith('>>'):
                 fil = open(fnam,'a')
             else:
                 fil = open(fnam,'w')
             obj = ip.ev(args[0])
             print "Writing '%s' (%s) to file '%s'." % (args[0],
               obj.__class__.__name__, fnam)
 
             
             if not isinstance (obj,basestring):
                 from pprint import pprint
                 pprint(obj,fil)
             else:
                 fil.write(obj)
                 if not obj.endswith('\n'):
                     fil.write('\n')
             
             fil.close()
             return
         
         # %store foo
         try:
             obj = ip.user_ns[args[0]]
         except KeyError:
             # it might be an alias
             if args[0] in self.alias_table:
                 staliases = db.get('stored_aliases',{})
                 staliases[ args[0] ] = self.alias_table[ args[0] ]
                 db['stored_aliases'] = staliases                
                 print "Alias stored:", args[0], self.alias_table[ args[0] ]
                 return
             else:
                 raise UsageError("Unknown variable '%s'" % args[0])
             
         else:
             if isinstance(inspect.getmodule(obj), FakeModule):
                 print textwrap.dedent("""\
                 Warning:%s is %s 
                 Proper storage of interactively declared classes (or instances
                 of those classes) is not possible! Only instances
                 of classes in real modules on file system can be %%store'd.
                 """ % (args[0], obj) ) 
                 return
             #pickled = pickle.dumps(obj)
             self.db[ 'autorestore/' + args[0] ] = obj
             print "Stored '%s' (%s)" % (args[0], obj.__class__.__name__)
 
 ip.expose_magic('store',magic_store)

IPython/Extensions/win32clip.py

@@ -1,45 +1,45 b''
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def clip_f( self, parameter_s = '' ):
     """Save a set of lines to the clipboard.
 
     Usage:\\
       %clip n1-n2 n3-n4 ... n5 .. n6 ...
 
     This function uses the same syntax as %macro for line extraction, but
     instead of creating a macro it saves the resulting string to the
     clipboard.
     
     When used without arguments, this returns the text contents of the clipboard. 
     E.g.
     
     mytext = %clip
     
     """
 
     import win32clipboard as cl
     import win32con
     args = parameter_s.split()
     cl.OpenClipboard()
     if len( args ) == 0:
         data = cl.GetClipboardData( win32con.CF_TEXT )
         cl.CloseClipboard()
         return data
     api = self.getapi()
     
     if parameter_s.lstrip().startswith('='):
         rest = parameter_s[parameter_s.index('=')+1:].strip()
         val = str(api.ev(rest))
     else:
         ranges = args[0:]
         val = ''.join( self.extract_input_slices( ranges ) )
 
     cl.EmptyClipboard()
     cl.SetClipboardText( val )
     cl.CloseClipboard()
     print 'The following text was written to the clipboard'
     print val
     
 ip.expose_magic( "clip", clip_f )

IPython/Prompts.py

@@ -1,627 +1,627 b''
 # -*- coding: utf-8 -*-
 """
 Classes for handling input/output prompts.
 """
 
 #*****************************************************************************
 #       Copyright (C) 2008-2009 The IPython Development Team
 #       Copyright (C) 2001-2007 Fernando Perez <[e-mail]>
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
 #****************************************************************************
 # Required modules
 import __builtin__
 import os
 import socket
 import sys
 import time
 
 # IPython's own
 from IPython.utils import coloransi
 from IPython import Release
 from IPython.external.Itpl import ItplNS
-from IPython.ipapi import TryNext
+from IPython.core.ipapi import TryNext
 from IPython.ipstruct import Struct
 from IPython.macro import Macro
 import IPython.utils.generics
 
 from IPython.utils.genutils import *
 
 #****************************************************************************
 #Color schemes for Prompts.
 
 PromptColors = coloransi.ColorSchemeTable()
 InputColors = coloransi.InputTermColors  # just a shorthand
 Colors = coloransi.TermColors  # just a shorthand
 
 PromptColors.add_scheme(coloransi.ColorScheme(
     'NoColor',
     in_prompt  = InputColors.NoColor,  # Input prompt
     in_number  = InputColors.NoColor,  # Input prompt number
     in_prompt2 = InputColors.NoColor, # Continuation prompt
     in_normal  = InputColors.NoColor,  # color off (usu. Colors.Normal)
     
     out_prompt = Colors.NoColor, # Output prompt
     out_number = Colors.NoColor, # Output prompt number
 
     normal = Colors.NoColor  # color off (usu. Colors.Normal)
     ))
 
 # make some schemes as instances so we can copy them for modification easily:
 __PColLinux =  coloransi.ColorScheme(
     'Linux',
     in_prompt  = InputColors.Green,
     in_number  = InputColors.LightGreen,
     in_prompt2 = InputColors.Green,
     in_normal  = InputColors.Normal,  # color off (usu. Colors.Normal)
 
     out_prompt = Colors.Red,
     out_number = Colors.LightRed,
 
     normal = Colors.Normal
     )
 # Don't forget to enter it into the table!
 PromptColors.add_scheme(__PColLinux)
 
 # Slightly modified Linux for light backgrounds
 __PColLightBG  = __PColLinux.copy('LightBG')
 
 __PColLightBG.colors.update(
     in_prompt  = InputColors.Blue,
     in_number  = InputColors.LightBlue,
     in_prompt2 = InputColors.Blue
 )
 PromptColors.add_scheme(__PColLightBG)
 
 del Colors,InputColors
 
 #-----------------------------------------------------------------------------
 def multiple_replace(dict, text):
     """ Replace in 'text' all occurences of any key in the given
     dictionary by its corresponding value.  Returns the new string."""
 
     # Function by Xavier Defrang, originally found at:
     # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/81330
 
     # Create a regular expression  from the dictionary keys
     regex = re.compile("(%s)" % "|".join(map(re.escape, dict.keys())))
     # For each match, look-up corresponding value in dictionary
     return regex.sub(lambda mo: dict[mo.string[mo.start():mo.end()]], text)
 
 #-----------------------------------------------------------------------------
 # Special characters that can be used in prompt templates, mainly bash-like
 
 # If $HOME isn't defined (Windows), make it an absurd string so that it can
 # never be expanded out into '~'.  Basically anything which can never be a
 # reasonable directory name will do, we just want the $HOME -> '~' operation
 # to become a no-op.  We pre-compute $HOME here so it's not done on every
 # prompt call.
 
 # FIXME:
 
 # - This should be turned into a class which does proper namespace management,
 # since the prompt specials need to be evaluated in a certain namespace.
 # Currently it's just globals, which need to be managed manually by code
 # below.
 
 # - I also need to split up the color schemes from the prompt specials
 # somehow.  I don't have a clean design for that quite yet.
 
 HOME = os.environ.get("HOME","//////:::::ZZZZZ,,,~~~")
 
 # We precompute a few more strings here for the prompt_specials, which are
 # fixed once ipython starts.  This reduces the runtime overhead of computing
 # prompt strings.
 USER           = os.environ.get("USER")
 HOSTNAME       = socket.gethostname()
 HOSTNAME_SHORT = HOSTNAME.split(".")[0]
 ROOT_SYMBOL    = "$#"[os.name=='nt' or os.getuid()==0]
 
 prompt_specials_color = {
     # Prompt/history count
     '%n' : '${self.col_num}' '${self.cache.prompt_count}' '${self.col_p}',
     r'\#': '${self.col_num}' '${self.cache.prompt_count}' '${self.col_p}',
     # Just the prompt counter number, WITHOUT any coloring wrappers, so users
     # can get numbers displayed in whatever color they want.
     r'\N': '${self.cache.prompt_count}',
 
     # Prompt/history count, with the actual digits replaced by dots.  Used
     # mainly in continuation prompts (prompt_in2)
     #r'\D': '${"."*len(str(self.cache.prompt_count))}',
     # More robust form of the above expression, that uses __builtins__
     r'\D': '${"."*__builtins__.len(__builtins__.str(self.cache.prompt_count))}',
 
     # Current working directory
     r'\w': '${os.getcwd()}',
     # Current time
     r'\t' : '${time.strftime("%H:%M:%S")}',
     # Basename of current working directory.
     # (use os.sep to make this portable across OSes)
     r'\W' : '${os.getcwd().split("%s")[-1]}' % os.sep,
     # These X<N> are an extension to the normal bash prompts.  They return
     # N terms of the path, after replacing $HOME with '~'
     r'\X0': '${os.getcwd().replace("%s","~")}' % HOME,
     r'\X1': '${self.cwd_filt(1)}',
     r'\X2': '${self.cwd_filt(2)}',
     r'\X3': '${self.cwd_filt(3)}',
     r'\X4': '${self.cwd_filt(4)}',
     r'\X5': '${self.cwd_filt(5)}',
     # Y<N> are similar to X<N>, but they show '~' if it's the directory
     # N+1 in the list.  Somewhat like %cN in tcsh.
     r'\Y0': '${self.cwd_filt2(0)}',
     r'\Y1': '${self.cwd_filt2(1)}',
     r'\Y2': '${self.cwd_filt2(2)}',
     r'\Y3': '${self.cwd_filt2(3)}',
     r'\Y4': '${self.cwd_filt2(4)}',
     r'\Y5': '${self.cwd_filt2(5)}',
     # Hostname up to first .
     r'\h': HOSTNAME_SHORT,
     # Full hostname
     r'\H': HOSTNAME,
     # Username of current user
     r'\u': USER,
     # Escaped '\'
     '\\\\': '\\',
     # Newline
     r'\n': '\n',
     # Carriage return
     r'\r': '\r',
     # Release version
     r'\v': Release.version,
     # Root symbol ($ or #)
     r'\$': ROOT_SYMBOL,
     }
 
 # A copy of the prompt_specials dictionary but with all color escapes removed,
 # so we can correctly compute the prompt length for the auto_rewrite method.
 prompt_specials_nocolor = prompt_specials_color.copy()
 prompt_specials_nocolor['%n'] = '${self.cache.prompt_count}'
 prompt_specials_nocolor[r'\#'] = '${self.cache.prompt_count}'
 
 # Add in all the InputTermColors color escapes as valid prompt characters.
 # They all get added as \\C_COLORNAME, so that we don't have any conflicts
 # with a color name which may begin with a letter used by any other of the
 # allowed specials.  This of course means that \\C will never be allowed for
 # anything else.
 input_colors = coloransi.InputTermColors
 for _color in dir(input_colors):
     if _color[0] != '_':
         c_name = r'\C_'+_color
         prompt_specials_color[c_name] = getattr(input_colors,_color)
         prompt_specials_nocolor[c_name] = ''
 
 # we default to no color for safety.  Note that prompt_specials is a global
 # variable used by all prompt objects.
 prompt_specials = prompt_specials_nocolor
 
 #-----------------------------------------------------------------------------
 def str_safe(arg):
     """Convert to a string, without ever raising an exception.
 
     If str(arg) fails, <ERROR: ... > is returned, where ... is the exception
     error message."""
 
     try:
         out = str(arg)
     except UnicodeError:
         try:
             out = arg.encode('utf_8','replace')
         except Exception,msg:
             # let's keep this little duplication here, so that the most common
             # case doesn't suffer from a double try wrapping.
             out = '<ERROR: %s>' % msg
     except Exception,msg:
         out = '<ERROR: %s>' % msg
     return out
 
 class BasePrompt(object):
     """Interactive prompt similar to Mathematica's."""
 
     def _get_p_template(self):
         return self._p_template
 
     def _set_p_template(self,val):
         self._p_template = val
         self.set_p_str()
 
     p_template = property(_get_p_template,_set_p_template,
                           doc='Template for prompt string creation')
 
     def __init__(self,cache,sep,prompt,pad_left=False):
 
         # Hack: we access information about the primary prompt through the
         # cache argument.  We need this, because we want the secondary prompt
         # to be aligned with the primary one.  Color table info is also shared
         # by all prompt classes through the cache.  Nice OO spaghetti code!
         self.cache = cache
         self.sep = sep
         
         # regexp to count the number of spaces at the end of a prompt
         # expression, useful for prompt auto-rewriting
         self.rspace = re.compile(r'(\s*)$')
         # Flag to left-pad prompt strings to match the length of the primary
         # prompt
         self.pad_left = pad_left
 
         # Set template to create each actual prompt (where numbers change).
         # Use a property
         self.p_template = prompt
         self.set_p_str()
 
     def set_p_str(self):
         """ Set the interpolating prompt strings.
 
         This must be called every time the color settings change, because the
         prompt_specials global may have changed."""
 
         import os,time  # needed in locals for prompt string handling
         loc = locals()
         try:
             self.p_str = ItplNS('%s%s%s' %
                                 ('${self.sep}${self.col_p}',
                                  multiple_replace(prompt_specials, self.p_template),
                                  '${self.col_norm}'),self.cache.user_ns,loc)
     
             self.p_str_nocolor = ItplNS(multiple_replace(prompt_specials_nocolor,
                                                          self.p_template),
                                         self.cache.user_ns,loc)
         except:
             print "Illegal prompt template (check $ usage!):",self.p_template
             self.p_str = self.p_template
             self.p_str_nocolor = self.p_template
 
     def write(self,msg):  # dbg
         sys.stdout.write(msg)
         return ''
 
     def __str__(self):
         """Return a string form of the prompt.
 
         This for is useful for continuation and output prompts, since it is
         left-padded to match lengths with the primary one (if the
         self.pad_left attribute is set)."""
 
         out_str = str_safe(self.p_str)
         if self.pad_left:
             # We must find the amount of padding required to match lengths,
             # taking the color escapes (which are invisible on-screen) into
             # account.
             esc_pad = len(out_str) - len(str_safe(self.p_str_nocolor))
             format = '%%%ss' % (len(str(self.cache.last_prompt))+esc_pad)
             return format % out_str
         else:
             return out_str
 
     # these path filters are put in as methods so that we can control the
     # namespace where the prompt strings get evaluated
     def cwd_filt(self,depth):
         """Return the last depth elements of the current working directory.
 
         $HOME is always replaced with '~'.
         If depth==0, the full path is returned."""
 
         cwd = os.getcwd().replace(HOME,"~")
         out = os.sep.join(cwd.split(os.sep)[-depth:])
         if out:
             return out
         else:
             return os.sep
 
     def cwd_filt2(self,depth):
         """Return the last depth elements of the current working directory.
 
         $HOME is always replaced with '~'.
         If depth==0, the full path is returned."""
 
         full_cwd = os.getcwd()
         cwd = full_cwd.replace(HOME,"~").split(os.sep)
         if '~' in cwd and len(cwd) == depth+1:
             depth += 1
         drivepart = ''
         if sys.platform == 'win32' and len(cwd) > depth:
             drivepart = os.path.splitdrive(full_cwd)[0]
         out = drivepart + '/'.join(cwd[-depth:])
 
         if out:
             return out
         else:
             return os.sep
 
     def __nonzero__(self):
         """Implement boolean behavior.
 
         Checks whether the p_str attribute is non-empty"""
 
         return bool(self.p_template)
 
 class Prompt1(BasePrompt):
     """Input interactive prompt similar to Mathematica's."""
 
     def __init__(self,cache,sep='\n',prompt='In [\\#]: ',pad_left=True):
         BasePrompt.__init__(self,cache,sep,prompt,pad_left)
 
     def set_colors(self):
         self.set_p_str()
         Colors = self.cache.color_table.active_colors # shorthand
         self.col_p = Colors.in_prompt
         self.col_num = Colors.in_number
         self.col_norm = Colors.in_normal
         # We need a non-input version of these escapes for the '--->'
         # auto-call prompts used in the auto_rewrite() method.
         self.col_p_ni = self.col_p.replace('\001','').replace('\002','') 
         self.col_norm_ni = Colors.normal        
         
     def __str__(self):
         self.cache.prompt_count += 1
         self.cache.last_prompt = str_safe(self.p_str_nocolor).split('\n')[-1]
         return str_safe(self.p_str)
 
     def auto_rewrite(self):
         """Print a string of the form '--->' which lines up with the previous
         input string. Useful for systems which re-write the user input when
         handling automatically special syntaxes."""
 
         curr = str(self.cache.last_prompt)
         nrspaces = len(self.rspace.search(curr).group())
         return '%s%s>%s%s' % (self.col_p_ni,'-'*(len(curr)-nrspaces-1),
                               ' '*nrspaces,self.col_norm_ni)
 
 class PromptOut(BasePrompt):
     """Output interactive prompt similar to Mathematica's."""
 
     def __init__(self,cache,sep='',prompt='Out[\\#]: ',pad_left=True):
         BasePrompt.__init__(self,cache,sep,prompt,pad_left)
         if not self.p_template:
             self.__str__ = lambda: ''
 
     def set_colors(self):
         self.set_p_str()
         Colors = self.cache.color_table.active_colors # shorthand
         self.col_p = Colors.out_prompt
         self.col_num = Colors.out_number
         self.col_norm = Colors.normal
 
 class Prompt2(BasePrompt):
     """Interactive continuation prompt."""
     
     def __init__(self,cache,prompt='   .\\D.: ',pad_left=True):
         self.cache = cache
         self.p_template = prompt
         self.pad_left = pad_left
         self.set_p_str()
 
     def set_p_str(self):
         import os,time  # needed in locals for prompt string handling
         loc = locals()
         self.p_str = ItplNS('%s%s%s' %
                             ('${self.col_p2}',
                              multiple_replace(prompt_specials, self.p_template),
                              '$self.col_norm'),
                             self.cache.user_ns,loc)
         self.p_str_nocolor = ItplNS(multiple_replace(prompt_specials_nocolor,
                                                      self.p_template),
                                     self.cache.user_ns,loc)
 
     def set_colors(self):
         self.set_p_str()
         Colors = self.cache.color_table.active_colors
         self.col_p2 = Colors.in_prompt2
         self.col_norm = Colors.in_normal
         # FIXME (2004-06-16) HACK: prevent crashes for users who haven't
         # updated their prompt_in2 definitions.  Remove eventually.
         self.col_p = Colors.out_prompt
         self.col_num = Colors.out_number
 
 
 #-----------------------------------------------------------------------------
 class CachedOutput:
     """Class for printing output from calculations while keeping a cache of
     reults. It dynamically creates global variables prefixed with _ which
     contain these results.
 
     Meant to be used as a sys.displayhook replacement, providing numbered
     prompts and cache services.
 
     Initialize with initial and final values for cache counter (this defines
     the maximum size of the cache."""
 
     def __init__(self,shell,cache_size,Pprint,
                  colors='NoColor',input_sep='\n',
                  output_sep='\n',output_sep2='',
                  ps1 = None, ps2 = None,ps_out = None,pad_left=True):
 
         cache_size_min = 3
         if cache_size <= 0:
             self.do_full_cache = 0
             cache_size = 0
         elif cache_size < cache_size_min:
             self.do_full_cache = 0
             cache_size = 0
             warn('caching was disabled (min value for cache size is %s).' %
                  cache_size_min,level=3)
         else:
             self.do_full_cache = 1
 
         self.cache_size = cache_size
         self.input_sep = input_sep
 
         # we need a reference to the user-level namespace
         self.shell = shell
         self.user_ns = shell.user_ns
         # and to the user's input
         self.input_hist = shell.input_hist
         # and to the user's logger, for logging output
         self.logger = shell.logger
 
         # Set input prompt strings and colors
         if cache_size == 0:
             if ps1.find('%n') > -1 or ps1.find(r'\#') > -1 \
                    or ps1.find(r'\N') > -1:
                 ps1 = '>>> '
             if ps2.find('%n') > -1 or ps2.find(r'\#') > -1 \
                    or ps2.find(r'\N') > -1:
                 ps2 = '... '
         self.ps1_str = self._set_prompt_str(ps1,'In [\\#]: ','>>> ')
         self.ps2_str = self._set_prompt_str(ps2,'   .\\D.: ','... ')
         self.ps_out_str = self._set_prompt_str(ps_out,'Out[\\#]: ','')
 
         self.color_table = PromptColors
         self.prompt1 = Prompt1(self,sep=input_sep,prompt=self.ps1_str,
                                pad_left=pad_left)
         self.prompt2 = Prompt2(self,prompt=self.ps2_str,pad_left=pad_left)
         self.prompt_out = PromptOut(self,sep='',prompt=self.ps_out_str,
                                     pad_left=pad_left)
         self.set_colors(colors)
 
         # other more normal stuff
         # b/c each call to the In[] prompt raises it by 1, even the first.
         self.prompt_count = 0
         # Store the last prompt string each time, we need it for aligning
         # continuation and auto-rewrite prompts
         self.last_prompt = ''
         self.Pprint = Pprint
         self.output_sep = output_sep
         self.output_sep2 = output_sep2
         self._,self.__,self.___ = '','',''
         self.pprint_types = map(type,[(),[],{}])
         
         # these are deliberately global:
         to_user_ns = {'_':self._,'__':self.__,'___':self.___}
         self.user_ns.update(to_user_ns)
 
     def _set_prompt_str(self,p_str,cache_def,no_cache_def):
         if p_str is None:
             if self.do_full_cache:
                 return cache_def
             else:
                 return no_cache_def
         else:
             return p_str
                 
     def set_colors(self,colors):
         """Set the active color scheme and configure colors for the three
         prompt subsystems."""
 
         # FIXME: the prompt_specials global should be gobbled inside this
         # class instead.  Do it when cleaning up the whole 3-prompt system.
         global prompt_specials
         if colors.lower()=='nocolor':
             prompt_specials = prompt_specials_nocolor
         else:
             prompt_specials = prompt_specials_color
         
         self.color_table.set_active_scheme(colors)
         self.prompt1.set_colors()
         self.prompt2.set_colors()
         self.prompt_out.set_colors()
 
     def __call__(self,arg=None):
         """Printing with history cache management.
         
         This is invoked everytime the interpreter needs to print, and is
         activated by setting the variable sys.displayhook to it."""
 
         # If something injected a '_' variable in __builtin__, delete
         # ipython's automatic one so we don't clobber that.  gettext() in
         # particular uses _, so we need to stay away from it.
         if '_' in __builtin__.__dict__:
             try:
                 del self.user_ns['_']
             except KeyError:
                 pass
         if arg is not None:
             cout_write = Term.cout.write # fast lookup
             # first handle the cache and counters
 
             # do not print output if input ends in ';'
             try:
                 if self.input_hist[self.prompt_count].endswith(';\n'):
                     return
             except IndexError:
                 # some uses of ipshellembed may fail here
                 pass
             # don't use print, puts an extra space
             cout_write(self.output_sep)
             outprompt = self.shell.hooks.generate_output_prompt()
             if self.do_full_cache:
                 cout_write(outprompt)
 
             # and now call a possibly user-defined print mechanism
             manipulated_val = self.display(arg)
             
             # user display hooks can change the variable to be stored in
             # output history
             
             if manipulated_val is not None:
                 arg = manipulated_val
                 
             # avoid recursive reference when displaying _oh/Out
             if arg is not self.user_ns['_oh']:
                 self.update(arg)
 
             if self.logger.log_output:
                 self.logger.log_write(repr(arg),'output')
             cout_write(self.output_sep2)
             Term.cout.flush()
 
     def _display(self,arg):
         """Default printer method, uses pprint.
 
         Do ip.set_hook("result_display", my_displayhook) for custom result
         display, e.g. when your own objects need special formatting.
         """
         try:
             return IPython.utils.generics.result_display(arg)
         except TryNext:            
             return self.shell.hooks.result_display(arg)
 
     # Assign the default display method:
     display = _display
 
     def update(self,arg):
         #print '***cache_count', self.cache_count # dbg
         if len(self.user_ns['_oh']) >= self.cache_size and self.do_full_cache:
             warn('Output cache limit (currently '+
                   `self.cache_size`+' entries) hit.\n'
                  'Flushing cache and resetting history counter...\n'
                  'The only history variables available will be _,__,___ and _1\n'
                  'with the current result.')
 
             self.flush()
         # Don't overwrite '_' and friends if '_' is in __builtin__ (otherwise
         # we cause buggy behavior for things like gettext).
         if '_' not in __builtin__.__dict__:
             self.___ = self.__
             self.__ = self._
             self._ = arg
             self.user_ns.update({'_':self._,'__':self.__,'___':self.___})
             
         # hackish access to top-level  namespace to create _1,_2... dynamically
         to_main = {}
         if self.do_full_cache:
             new_result = '_'+`self.prompt_count`
             to_main[new_result] = arg
             self.user_ns.update(to_main)
             self.user_ns['_oh'][self.prompt_count] = arg
 
     def flush(self):
         if not self.do_full_cache:
             raise ValueError,"You shouldn't have reached the cache flush "\
                   "if full caching is not enabled!"
         # delete auto-generated vars from global namespace
         
         for n in range(1,self.prompt_count + 1):
             key = '_'+`n`
             try:
                 del self.user_ns[key]
             except: pass
         self.user_ns['_oh'].clear()
         
         if '_' not in __builtin__.__dict__:
             self.user_ns.update({'_':None,'__':None, '___':None})
         import gc
         gc.collect() # xxx needed?