diff --git a/IPython/config/__init__.py b/IPython/config/__init__.py
new file mode 100644
index 0000000..876b4f3
--- /dev/null
+++ b/IPython/config/__init__.py
@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/config/api.py b/IPython/config/api.py
new file mode 100644
index 0000000..1fca60e
--- /dev/null
+++ b/IPython/config/api.py
@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+"""This is the official entry point to IPython's configuration system.  """
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+from IPython.config.cutils import get_home_dir, get_ipython_dir
+from IPython.external.configobj import ConfigObj
+
+class ConfigObjManager(object):
+    
+    def __init__(self, configObj, filename):
+        self.current = configObj
+        self.current.indent_type = '    '
+        self.filename = filename
+        # self.write_default_config_file()
+        
+    def get_config_obj(self):
+        return self.current
+    
+    def update_config_obj(self, newConfig):
+        self.current.merge(newConfig)
+        
+    def update_config_obj_from_file(self, filename):
+        newConfig = ConfigObj(filename, file_error=False)
+        self.current.merge(newConfig)
+        
+    def update_config_obj_from_default_file(self, ipythondir=None):
+        fname = self.resolve_file_path(self.filename, ipythondir)
+        self.update_config_obj_from_file(fname)
+
+    def write_config_obj_to_file(self, filename):
+        f = open(filename, 'w')
+        self.current.write(f)
+        f.close()
+
+    def write_default_config_file(self):
+        ipdir = get_ipython_dir()
+        fname = ipdir + '/' + self.filename
+        if not os.path.isfile(fname):
+            print "Writing the configuration file to: " + fname
+            self.write_config_obj_to_file(fname)
+    
+    def _import(self, key):
+        package = '.'.join(key.split('.')[0:-1])
+        obj = key.split('.')[-1]
+        execString = 'from %s import %s' % (package, obj)
+        exec execString
+        exec 'temp = %s' % obj 
+        return temp
+
+    def resolve_file_path(self, filename, ipythondir = None):
+        """Resolve filenames into absolute paths.
+
+        This function looks in the following directories in order:
+
+        1.  In the current working directory or by absolute path with ~ expanded
+        2.  In ipythondir if that is set
+        3.  In the IPYTHONDIR environment variable if it exists
+        4.  In the ~/.ipython directory
+
+        Note: The IPYTHONDIR is also used by the trunk version of IPython so
+               changing it will also affect it was well.
+        """
+
+        # In cwd or by absolute path with ~ expanded
+        trythis = os.path.expanduser(filename)
+        if os.path.isfile(trythis):
+            return trythis
+
+        # In ipythondir if it is set
+        if ipythondir is not None:
+            trythis = ipythondir + '/' + filename
+            if os.path.isfile(trythis):
+                return trythis        
+
+        trythis = get_ipython_dir() + '/' + filename
+        if os.path.isfile(trythis):
+            return trythis
+
+        return None
+
+
+    
+    
+
+    
diff --git a/IPython/config/cutils.py b/IPython/config/cutils.py
new file mode 100644
index 0000000..ad3cfc4
--- /dev/null
+++ b/IPython/config/cutils.py
@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+"""Configuration-related utilities for all IPython."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+import sys
+
+#---------------------------------------------------------------------------
+# Normal code begins
+#---------------------------------------------------------------------------
+
+class HomeDirError(Exception):
+    pass
+
+def get_home_dir():
+    """Return the closest possible equivalent to a 'home' directory.
+
+    We first try $HOME.  Absent that, on NT it's $HOMEDRIVE\$HOMEPATH.
+
+    Currently only Posix and NT are implemented, a HomeDirError exception is
+    raised for all other OSes. """
+
+    isdir = os.path.isdir
+    env = os.environ
+    try:
+        homedir = env['HOME']
+        if not isdir(homedir):
+            # in case a user stuck some string which does NOT resolve to a
+            # valid path, it's as good as if we hadn't foud it
+            raise KeyError
+        return homedir
+    except KeyError:
+        if os.name == 'posix':
+            raise HomeDirError,'undefined $HOME, IPython can not proceed.'
+        elif os.name == 'nt':
+            # For some strange reason, win9x returns 'nt' for os.name.
+            try:
+                homedir = os.path.join(env['HOMEDRIVE'],env['HOMEPATH'])
+                if not isdir(homedir):
+                    homedir = os.path.join(env['USERPROFILE'])
+                    if not isdir(homedir):
+                        raise HomeDirError
+                return homedir
+            except:
+                try:
+                    # Use the registry to get the 'My Documents' folder.
+                    import _winreg as wreg
+                    key = wreg.OpenKey(wreg.HKEY_CURRENT_USER,
+                                       "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
+                    homedir = wreg.QueryValueEx(key,'Personal')[0]
+                    key.Close()
+                    if not isdir(homedir):
+                        e = ('Invalid "Personal" folder registry key '
+                             'typically "My Documents".\n'
+                             'Value: %s\n'
+                             'This is not a valid directory on your system.' %
+                             homedir)
+                        raise HomeDirError(e)
+                    return homedir
+                except HomeDirError:
+                    raise
+                except:
+                    return 'C:\\'
+        elif os.name == 'dos':
+            # Desperate, may do absurd things in classic MacOS. May work under DOS.
+            return 'C:\\'
+        else:
+            raise HomeDirError,'support for your operating system not implemented.'
+
+def get_ipython_dir():
+    ipdir_def = '.ipython'
+    home_dir = get_home_dir()
+    ipdir = os.path.abspath(os.environ.get('IPYTHONDIR',
+                                           os.path.join(home_dir,ipdir_def)))
+    return ipdir
+
+def import_item(key):
+    """
+    Import and return bar given the string foo.bar.
+    """
+    package = '.'.join(key.split('.')[0:-1])
+    obj = key.split('.')[-1]
+    execString = 'from %s import %s' % (package, obj)
+    exec execString
+    exec 'temp = %s' % obj 
+    return temp
diff --git a/IPython/config/sconfig.py b/IPython/config/sconfig.py
new file mode 100644
index 0000000..886d201
--- /dev/null
+++ b/IPython/config/sconfig.py
@@ -0,0 +1,622 @@
+# encoding: utf-8
+
+"""Mix of ConfigObj and Struct-like access.
+
+Provides:
+
+- Coupling a Struct object to a ConfigObj one, so that changes to the Traited
+  instance propagate back into the ConfigObj.
+
+- A declarative interface for describing configurations that automatically maps
+  to valid ConfigObj representations.
+
+- From these descriptions, valid .conf files can be auto-generated, with class
+  docstrings and traits information used for initial auto-documentation.
+
+- Hierarchical inclusion of files, so that a base config can be overridden only
+  in specific spots.
+
+
+Notes:
+
+The file creation policy is:
+
+1. Creating a SConfigManager(FooConfig,'missingfile.conf')  will work
+fine, and 'missingfile.conf' will be created empty.
+
+2. Creating SConfigManager(FooConfig,'OKfile.conf') where OKfile.conf has
+
+include = 'missingfile.conf'
+
+conks out with IOError.
+
+My rationale is that creating top-level empty files is a common and
+reasonable need, but that having invalid include statements should
+raise an error right away, so people know immediately that their files
+have gone stale.
+
+
+TODO:
+
+  - Turn the currently interactive tests into proper doc/unit tests.  Complete
+    docstrings. 
+
+  - Write the real ipython1 config system using this.  That one is more
+  complicated than either the MPL one or the fake 'ipythontest' that I wrote
+  here, and it requires solving the issue of declaring references to other
+  objects inside the config files.
+
+  - [Low priority] Write a custom TraitsUI view so that hierarchical
+  configurations provide nicer interactive editing.  The automatic system is
+  remarkably good, but for very complex configurations having a nicely
+  organized view would be nice.
+"""
+
+__docformat__ = "restructuredtext en"
+__license__ = 'BSD'
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+############################################################################
+# Stdlib imports
+############################################################################
+from cStringIO import StringIO
+from inspect import isclass
+
+import os
+import textwrap
+
+############################################################################
+# External imports
+############################################################################
+
+from IPython.external import configobj
+
+############################################################################
+# Utility functions
+############################################################################
+
+def get_split_ind(seq, N):
+    """seq is a list of words.  Return the index into seq such that
+    len(' '.join(seq[:ind])<=N
+    """
+
+    sLen = 0
+    # todo: use Alex's xrange pattern from the cbook for efficiency
+    for (word, ind) in zip(seq, range(len(seq))):
+        sLen += len(word) + 1  # +1 to account for the len(' ')
+        if sLen>=N: return ind
+    return len(seq)
+
+def wrap(prefix, text, cols, max_lines=6):
+    """'wrap text with prefix at length cols"""
+    pad = ' '*len(prefix.expandtabs())
+    available = cols - len(pad)
+
+    seq = text.split(' ')
+    Nseq = len(seq)
+    ind = 0
+    lines = []
+    while ind<Nseq:
+        lastInd = ind
+        ind += get_split_ind(seq[ind:], available)
+        lines.append(seq[lastInd:ind])
+
+    num_lines = len(lines)
+    abbr_end = max_lines // 2
+    abbr_start = max_lines - abbr_end
+    lines_skipped = False
+    for i in range(num_lines):
+        if i == 0:
+            # add the prefix to the first line, pad with spaces otherwise
+            ret = prefix + ' '.join(lines[i]) + '\n'
+        elif i < abbr_start or i > num_lines-abbr_end-1:
+            ret += pad + ' '.join(lines[i]) + '\n'
+        else:
+            if not lines_skipped:
+                lines_skipped = True
+                ret += ' <...snipped %d lines...> \n' % (num_lines-max_lines)
+#    for line in lines[1:]:
+#        ret += pad + ' '.join(line) + '\n'
+    return ret[:-1]
+
+def dedent(txt):
+    """A modified version of textwrap.dedent, specialized for docstrings.
+
+    This version doesn't get confused by the first line of text having
+    inconsistent indentation from the rest, which happens a lot in docstrings.
+
+    :Examples:
+
+        >>> s = '''
+        ... First line.
+        ... More...
+        ... End'''
+
+        >>> print dedent(s)
+        First line.
+        More...
+        End
+
+        >>> s = '''First line
+        ... More...
+        ... End'''
+
+        >>> print dedent(s)
+        First line
+        More...
+        End
+    """
+    out = [textwrap.dedent(t) for t in txt.split('\n',1)
+           if t and not t.isspace()]
+    return '\n'.join(out)
+
+
+def comment(strng,indent=''):
+    """return an input string, commented out"""
+    template = indent + '# %s'
+    lines = [template % s for s in strng.splitlines(True)]
+    return ''.join(lines)
+
+
+def configobj2str(cobj):
+    """Dump a Configobj instance to a string."""
+    outstr = StringIO()
+    cobj.write(outstr)
+    return outstr.getvalue()
+
+def get_config_filename(conf):
+    """Find the filename attribute of a ConfigObj given a sub-section object.
+    """
+    depth = conf.depth
+    for d in range(depth):
+        conf = conf.parent
+    return conf.filename
+
+def sconf2File(sconf,fname,force=False):
+    """Write a SConfig instance to a given filename.
+
+    :Keywords:
+
+      force : bool (False)
+        If true, force writing even if the file exists.
+      """
+    
+    if os.path.isfile(fname) and not force:
+        raise IOError("File %s already exists, use force=True to overwrite" %
+                      fname)
+
+    txt = repr(sconf)
+
+    fobj = open(fname,'w')
+    fobj.write(txt)
+    fobj.close()
+
+def filter_scalars(sc):
+    """ input sc MUST be sorted!!!"""
+    scalars = []
+    maxi = len(sc)-1
+    i = 0
+    while i<len(sc):
+        t = sc[i]
+        if t.startswith('_sconf_'):
+            # Skip altogether private _sconf_ attributes, so we actually issue
+            # a 'continue' call to avoid the append(t) below
+            i += 1
+            continue
+        scalars.append(t)
+        i += 1
+
+    return scalars
+
+
+def get_scalars(obj):
+    """Return scalars for a Sconf class object"""
+
+    skip = set(['trait_added','trait_modified'])
+    sc = [k for k in obj.__dict__ if not k.startswith('_')]
+    sc.sort()
+    return filter_scalars(sc)
+
+
+def get_sections(obj,sectionClass):
+    """Return sections for a Sconf class object"""
+    return [(n,v) for (n,v) in obj.__dict__.iteritems()
+            if isclass(v) and issubclass(v,sectionClass)]
+
+
+def get_instance_sections(inst):
+    """Return sections for a Sconf instance"""
+    sections = [(k,v) for k,v in inst.__dict__.iteritems()
+                if isinstance(v,SConfig) and not k=='_sconf_parent']
+    # Sort the sections by name
+    sections.sort(key=lambda x:x[0])
+    return sections
+
+
+def partition_instance(obj):
+    """Return scalars,sections for a given Sconf instance.
+    """
+    scnames = []
+    sections = []
+    for k,v in obj.__dict__.iteritems():
+        if isinstance(v,SConfig):
+            if not k=='_sconf_parent':
+                sections.append((k,v))
+        else:
+            scnames.append(k)
+
+    # Sort the sections by name
+    sections.sort(key=lambda x:x[0])
+
+    # Sort the scalar names, filter them and then extract the actual objects
+    scnames.sort()
+    scnames = filter_scalars(scnames)
+    scalars = [(s,obj.__dict__[s]) for s in scnames]
+    
+    return scalars, sections
+
+
+def mk_ConfigObj(filename,mk_missing_file=True):
+    """Return a ConfigObj instance with our hardcoded conventions.
+
+    Use a simple factory that wraps our option choices for using ConfigObj.
+    I'm hard-wiring certain choices here, so we'll always use instances with
+    THESE choices.
+
+    :Parameters:
+
+      filename : string
+        File to read from.
+
+    :Keywords:
+      makeMissingFile : bool (True)
+        If true, the file named by `filename` may not yet exist and it will be
+        automatically created (empty).  Else, if `filename` doesn't exist, an
+        IOError will be raised.
+    """
+
+    if mk_missing_file:
+        create_empty = True
+        file_error = False
+    else:
+        create_empty = False
+        file_error = True
+        
+    return configobj.ConfigObj(filename,
+                               create_empty=create_empty,
+                               file_error=file_error,
+                               indent_type='    ',
+                               interpolation='Template',
+                               unrepr=True)
+
+nullConf = mk_ConfigObj(None)
+
+
+class RecursiveConfigObj(object):
+    """Object-oriented interface for recursive ConfigObj constructions."""
+
+    def __init__(self,filename):
+        """Return a ConfigObj instance with our hardcoded conventions.
+
+        Use a simple factory that wraps our option choices for using ConfigObj.
+        I'm hard-wiring certain choices here, so we'll always use instances with
+        THESE choices.
+
+        :Parameters:
+
+          filename : string
+            File to read from.
+        """
+
+        self.comp = []
+        self.conf = self._load(filename)
+
+    def _load(self,filename,mk_missing_file=True):
+        conf = mk_ConfigObj(filename,mk_missing_file)
+
+        # Do recursive loading. We only allow (or at least honor) the include
+        # tag at the top-level.  For now, we drop the inclusion information so
+        # that there are no restrictions on which levels of the SConfig
+        # hierarchy can use include statements.  But this means that
+
+        # if bookkeeping of each separate component of the recursive
+        # construction was requested, make a separate object for storage
+        # there, since we don't want that to be modified by the inclusion
+        # process.
+        self.comp.append(mk_ConfigObj(filename,mk_missing_file))
+
+        incfname = conf.pop('include',None)
+        if incfname is not None:
+            # Do recursive load.  We don't want user includes that point to
+            # missing files to fail silently, so in the recursion we disable
+            # auto-creation of missing files.
+            confinc = self._load(incfname,mk_missing_file=False)
+
+            # Update with self to get proper ordering (included files provide
+            # base data, current one overwrites)
+            confinc.update(conf)
+            # And do swap to return the updated structure
+            conf = confinc
+            # Set the filename to be the original file instead of the included
+            # one
+            conf.filename = filename
+        return conf
+        
+############################################################################
+# Main SConfig class and supporting exceptions
+############################################################################
+
+class SConfigError(Exception): pass
+
+class SConfigInvalidKeyError(SConfigError): pass
+
+class SConfig(object):
+    """A class representing configuration objects.
+
+    Note: this class should NOT have any traits itself, since the actual traits
+    will be declared by subclasses.  This class is meant to ONLY declare the
+    necessary initialization/validation methods.  """
+
+    # Any traits declared here are prefixed with _sconf_ so that our special
+    # formatting/analysis utilities can distinguish them from user traits and
+    # can avoid them.
+    
+    # Once created, the tree's hierarchy can NOT be modified
+    _sconf_parent = None
+
+    def __init__(self,config=None,parent=None,monitor=None):
+        """Makes an  SConfig object out of a ConfigObj instance
+        """
+
+        if config is None:
+            config = mk_ConfigObj(None)
+
+        # Validate the set of scalars ...
+        my_scalars = set(get_scalars(self))
+        cf_scalars = set(config.scalars)
+        invalid_scalars = cf_scalars - my_scalars
+        if invalid_scalars:
+            config_fname = get_config_filename(config)
+            m=("In config defined in file: %r\n"
+               "Error processing section: %s\n"
+               "These keys are invalid : %s\n"
+               "Valid key names        : %s\n"
+               % (config_fname,self.__class__.__name__,
+                  list(invalid_scalars),list(my_scalars)))
+            raise SConfigInvalidKeyError(m)
+
+        # ... and sections
+        section_items = get_sections(self.__class__,SConfig)
+        my_sections = set([n for n,v in section_items])
+        cf_sections = set(config.sections)
+        invalid_sections = cf_sections - my_sections
+        if invalid_sections:
+            config_fname = get_config_filename(config)
+            m = ("In config defined in file: %r\n"
+                 "Error processing section: %s\n"
+                 "These subsections are invalid : %s\n"
+                 "Valid subsection names        : %s\n"
+                 % (config_fname,self.__class__.__name__,
+                    list(invalid_sections),list(my_sections)))
+            raise SConfigInvalidKeyError(m)
+
+        self._sconf_parent = parent
+
+        # Now set the traits based on the config
+        for k in my_scalars:
+            setattr(self,k,config[k])
+
+        # And build subsections
+        for s,v in section_items:
+            sec_config = config.setdefault(s,{})
+            section = v(sec_config,self,monitor=monitor)
+
+            # We must use add_trait instead of setattr because we inherit from
+            # HasStrictTraits, but we need to then do a 'dummy' getattr call on
+            # self so the class trait propagates to the instance.
+            self.add_trait(s,section)
+            getattr(self,s)
+
+    def __repr__(self,depth=0):
+        """Dump a section to a string."""
+
+        indent = '    '*(depth)
+
+        top_name = self.__class__.__name__
+
+        if depth == 0:
+            label = '# %s - plaintext (in .conf format)\n' % top_name
+        else:
+            # Section titles are indented one level less than their contents in
+            # the ConfigObj write methods.
+            sec_indent = '    '*(depth-1)
+            label = '\n'+sec_indent+('[' * depth) + top_name + (']'*depth)
+
+        out = [label]
+
+        doc = self.__class__.__doc__
+        if doc is not None:
+            out.append(comment(dedent(doc),indent))
+
+        scalars, sections = partition_instance(self)
+
+        for s,v in scalars:
+            try:
+                info = self.__base_traits__[s].handler.info()
+                # Get a short version of info with lines of max. 78 chars, so
+                # that after commenting them out (with '# ') they are at most
+                # 80-chars long.
+                out.append(comment(wrap('',info.replace('\n', ' '),78-len(indent)),indent))
+            except (KeyError,AttributeError):
+                pass
+            out.append(indent+('%s = %r' % (s,v)))
+
+        for sname,sec in sections:
+            out.append(sec.__repr__(depth+1))
+
+        return '\n'.join(out)
+
+    def __str__(self):
+        return self.__class__.__name__
+
+
+##############################################################################
+# High-level class(es) and utilities for handling a coupled pair of SConfig and
+# ConfigObj instances.
+##############################################################################
+
+def path_to_root(obj):
+    """Find the path to the root of a nested SConfig instance."""
+    ob = obj
+    path = []
+    while ob._sconf_parent is not None:
+        path.append(ob.__class__.__name__)
+        ob = ob._sconf_parent
+    path.reverse()
+    return path
+
+
+def set_value(fconf,path,key,value):
+    """Set a value on a ConfigObj instance, arbitrarily deep."""
+    section = fconf
+    for sname in path:
+        section = section.setdefault(sname,{})
+    section[key] = value
+
+
+def fmonitor(fconf):
+    """Make a monitor for coupling SConfig instances to ConfigObj ones.
+
+    We must use a closure because Traits makes assumptions about the functions
+    used with on_trait_change() that prevent the use of a callable instance.
+    """
+    
+    def mon(obj,name,new):
+        #print 'OBJ:',obj  # dbg
+        #print 'NAM:',name # dbg
+        #print 'NEW:',new  # dbg
+        set_value(fconf,path_to_root(obj),name,new)
+        
+    return mon
+
+
+class SConfigManager(object):
+    """A simple object to manage and sync a SConfig and a ConfigObj pair.
+    """
+    
+    def __init__(self,configClass,configFilename,filePriority=True):
+        """Make a new SConfigManager.
+
+        :Parameters:
+        
+          configClass : class
+
+          configFilename : string
+            If the filename points to a non-existent file, it will be created
+            empty.  This is useful when creating a file form from an existing
+            configClass with the class defaults.
+
+
+        :Keywords:
+
+          filePriority : bool (True)
+
+            If true, at construction time the file object takes priority and
+            overwrites the contents of the config object.  Else, the data flow
+            is reversed and the file object will be overwritten with the
+            configClass defaults at write() time.
+        """
+
+        rconf = RecursiveConfigObj(configFilename)
+        # In a hierarchical object, the two following fconfs are *very*
+        # different.  In self.fconf, we'll keep the outer-most fconf associated
+        # directly to the original filename.  self.fconf_combined, instead,
+        # contains an object which has the combined effect of having merged all
+        # the called files in the recursive chain.
+        self.fconf = rconf.comp[0]
+        self.fconf_combined = rconf.conf
+
+        # Create a monitor to track and apply trait changes to the sconf
+        # instance over into the fconf one
+        monitor = fmonitor(self.fconf)
+        
+        if filePriority:
+            self.sconf = configClass(self.fconf_combined,monitor=monitor)
+        else:
+            # Push defaults onto file object
+            self.sconf = configClass(mk_ConfigObj(None),monitor=monitor)
+            self.fconfUpdate(self.fconf,self.sconf)
+
+    def fconfUpdate(self,fconf,sconf):
+        """Update the fconf object with the data from sconf"""
+
+        scalars, sections = partition_instance(sconf)
+
+        for s,v in scalars:
+            fconf[s] = v
+
+        for secname,sec in sections:
+            self.fconfUpdate(fconf.setdefault(secname,{}),sec)
+
+    def write(self,filename=None):
+        """Write out to disk.
+
+        This method writes out only to the top file in a hierarchical
+        configuration, which means that the class defaults and other values not
+        explicitly set in the top level file are NOT written out.
+
+        :Keywords:
+        
+          filename : string (None)
+            If given, the output is written to this file, otherwise the
+            .filename attribute of the top-level configuration object is used.
+        """
+        if filename is not None:
+            file_obj = open(filename,'w')
+            out = self.fconf.write(file_obj)
+            file_obj.close()
+            return out
+        else:
+            return self.fconf.write()
+
+    def writeAll(self,filename=None):
+        """Write out the entire configuration to disk.
+
+        This method, in contrast with write(), updates the .fconf_combined
+        object with the *entire* .sconf instance, and then writes it out to
+        disk.  This method is thus useful for generating files that have a
+        self-contained, non-hierarchical file.
+
+        :Keywords:
+        
+          filename : string (None)
+            If given, the output is written to this file, otherwise the
+            .filename attribute of the top-level configuration object is used.
+        """
+        if filename is not None:
+            file_obj = open(filename,'w')
+            self.fconfUpdate(self.fconf_combined,self.sconf)
+            out = self.fconf_combined.write(file_obj)
+            file_obj.close()
+            return out
+        else:
+            self.fconfUpdate(self.fconf_combined,self.sconf)
+            return self.fconf_combined.write()
+
+    def sconf_str(self):
+        return str(self.sconf)
+
+    def fconf_str(self):
+        return configobj2str(self.fconf)
+
+    __repr__ = __str__ = fconf_str
diff --git a/IPython/config/tests/sctst.py b/IPython/config/tests/sctst.py
new file mode 100644
index 0000000..7769d08
--- /dev/null
+++ b/IPython/config/tests/sctst.py
@@ -0,0 +1,37 @@
+"""Little utilities for testing tconfig.
+
+This module is meant to be used via
+
+import sctst; reload(sctst)
+from sctst import *
+
+at the top of the actual test scripts, so that they all get the entire set of
+common test tools with minimal fuss.
+"""
+
+# Standard library imports
+import os
+import sys
+from pprint import pprint
+
+# Our own imports.
+
+from IPython.config import sconfig
+reload(sconfig)
+
+from sconfig import mkConfigObj, RecursiveConfigObj, SConfigManager, \
+     sconf2file
+
+# Simple utilities/classes for testing
+
+def cat(fname):
+    print '### FILENAME:',fname
+    print open(fname).read()
+
+
+class App(object):
+    """A trivial 'application' class to be initialized.
+    """
+    def __init__(self,config_class,config_filename):
+        self.rcman = SConfigManager(config_class,config_filename)
+        self.rc = self.rcman.sconf
diff --git a/IPython/config/tests/simple.conf b/IPython/config/tests/simple.conf
new file mode 100644
index 0000000..ba0ca67
--- /dev/null
+++ b/IPython/config/tests/simple.conf
@@ -0,0 +1,14 @@
+# Toy example of a TConfig-based configuration description
+
+# This is the class declaration for the configuration:
+
+#  SimpleConfig
+#  Configuration for my application
+
+solver = "Iterative2"
+
+[Protocol]
+    # Specify the Protocol
+
+    ptype = "http2"
+    max_users = 4 
diff --git a/IPython/config/tests/simple.spec.conf b/IPython/config/tests/simple.spec.conf
new file mode 100644
index 0000000..1fcb9e1
--- /dev/null
+++ b/IPython/config/tests/simple.spec.conf
@@ -0,0 +1,14 @@
+# Toy example of a TConfig-based configuration description
+
+# This is the class declaration for the configuration:
+
+#  SimpleConfig
+#  Configuration for my application
+
+datafile = string(default='data.txt')
+solver = option('Direct','Iterative')
+
+[Protocol]
+    # Specify the Protocol
+    ptype = option('http','ftp','ssh')
+    max_users = integer(1,10)
diff --git a/IPython/config/tests/simpleconf.py b/IPython/config/tests/simpleconf.py
new file mode 100644
index 0000000..2af9794
--- /dev/null
+++ b/IPython/config/tests/simpleconf.py
@@ -0,0 +1,59 @@
+"""Toy example of reading an SConf object."""
+
+from IPython.external.configobj import ConfigObj
+from IPython.external import configobj, validate
+
+
+from IPython.config import sconfig
+reload(sconfig)
+
+configspecfilename = 'simple.spec.conf'
+filename = 'simple.conf'
+
+print '*'*80
+configspec = ConfigObj(configspecfilename, encoding='UTF8',
+                       list_values=False)
+print sconfig.configobj2str(configspec)
+
+print '*'*80
+config = ConfigObj(filename, configspec=configspec,
+                   interpolation='Template',
+                   unrepr=True)
+print sconfig.configobj2str(config)
+vdt = validate.Validator()
+test = config.validate(vdt,preserve_errors=True)
+
+####
+vdt = validate.Validator()
+class Bunch: pass
+vf = Bunch()
+vf.__dict__.update(vdt.functions)
+vf.pass_ = vdt.functions['pass']
+vf.__dict__.pop('',None)
+vf.__dict__.pop('pass',None)
+###
+
+
+if test==True:
+    print 'All OK'
+else:
+    err = configobj.flatten_errors(config,test)
+    print 'Flat errors:'
+    for secs,key,result in err:
+        if secs == []:
+            print 'DEFAULT:','key:',key,'err:',result
+        else:
+            print 'Secs:',secs,'key:',key,'err:',result
+
+
+##
+print '*'*80
+
+sc = sconfig.SConfig(configspecfilename)
+
+
+
+####
+
+            
+        
diff --git a/IPython/external/external/Itpl.py b/IPython/external/external/Itpl.py
new file mode 100644
index 0000000..e792cc0
--- /dev/null
+++ b/IPython/external/external/Itpl.py
@@ -0,0 +1,278 @@
+# -*- coding: utf-8 -*-
+"""String interpolation for Python (by Ka-Ping Yee, 14 Feb 2000).
+
+This module lets you quickly and conveniently interpolate values into
+strings (in the flavour of Perl or Tcl, but with less extraneous
+punctuation).  You get a bit more power than in the other languages,
+because this module allows subscripting, slicing, function calls,
+attribute lookup, or arbitrary expressions.  Variables and expressions
+are evaluated in the namespace of the caller.
+
+The itpl() function returns the result of interpolating a string, and
+printpl() prints out an interpolated string.  Here are some examples:
+
+    from Itpl import printpl
+    printpl("Here is a $string.")
+    printpl("Here is a $module.member.")
+    printpl("Here is an $object.member.")
+    printpl("Here is a $functioncall(with, arguments).")
+    printpl("Here is an ${arbitrary + expression}.")
+    printpl("Here is an $array[3] member.")
+    printpl("Here is a $dictionary['member'].")
+
+The filter() function filters a file object so that output through it
+is interpolated.  This lets you produce the illusion that Python knows
+how to do interpolation:
+
+    import Itpl
+    sys.stdout = Itpl.filter()
+    f = "fancy"
+    print "Isn't this $f?"
+    print "Standard output has been replaced with a $sys.stdout object."
+    sys.stdout = Itpl.unfilter()
+    print "Okay, back $to $normal."
+
+Under the hood, the Itpl class represents a string that knows how to
+interpolate values.  An instance of the class parses the string once
+upon initialization; the evaluation and substitution can then be done
+each time the instance is evaluated with str(instance).  For example:
+
+    from Itpl import Itpl
+    s = Itpl("Here is $foo.")
+    foo = 5
+    print str(s)
+    foo = "bar"
+    print str(s)
+
+$Id: Itpl.py 2305 2007-05-04 05:34:42Z bgranger $
+"""                   # ' -> close an open quote for stupid emacs
+
+#*****************************************************************************
+#
+# Copyright (c) 2001 Ka-Ping Yee <ping@lfw.org>
+#
+#
+# Published under the terms of the MIT license, hereby reproduced:
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+#*****************************************************************************
+
+__author__  = 'Ka-Ping Yee <ping@lfw.org>'
+__license__ = 'MIT'
+
+import string
+import sys
+from tokenize import tokenprog
+from types import StringType
+
+class ItplError(ValueError):
+    def __init__(self, text, pos):
+        self.text = text
+        self.pos = pos
+    def __str__(self):
+        return "unfinished expression in %s at char %d" % (
+            repr(self.text), self.pos)
+
+def matchorfail(text, pos):
+    match = tokenprog.match(text, pos)
+    if match is None:
+        raise ItplError(text, pos)
+    return match, match.end()
+
+class Itpl:
+    """Class representing a string with interpolation abilities.
+    
+    Upon creation, an instance works out what parts of the format
+    string are literal and what parts need to be evaluated.  The
+    evaluation and substitution happens in the namespace of the
+    caller when str(instance) is called."""
+
+    def __init__(self, format,codec='utf_8',encoding_errors='backslashreplace'):
+        """The single mandatory argument to this constructor is a format
+        string.
+
+        The format string is parsed according to the following rules:
+
+        1.  A dollar sign and a name, possibly followed by any of: 
+              - an open-paren, and anything up to the matching paren 
+              - an open-bracket, and anything up to the matching bracket 
+              - a period and a name 
+            any number of times, is evaluated as a Python expression.
+
+        2.  A dollar sign immediately followed by an open-brace, and
+            anything up to the matching close-brace, is evaluated as
+            a Python expression.
+
+        3.  Outside of the expressions described in the above two rules,
+            two dollar signs in a row give you one literal dollar sign.
+
+        Optional arguments:
+
+        - codec('utf_8'): a string containing the name of a valid Python
+        codec.
+
+        - encoding_errors('backslashreplace'): a string with a valid error handling
+        policy.  See the codecs module documentation for details.
+
+        These are used to encode the format string if a call to str() fails on
+        the expanded result."""
+
+        if not isinstance(format,basestring):
+            raise TypeError, "needs string initializer"
+        self.format = format
+        self.codec = codec
+        self.encoding_errors = encoding_errors
+        
+        namechars = "abcdefghijklmnopqrstuvwxyz" \
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+        chunks = []
+        pos = 0
+
+        while 1:
+            dollar = string.find(format, "$", pos)
+            if dollar < 0: break
+            nextchar = format[dollar+1]
+
+            if nextchar == "{":
+                chunks.append((0, format[pos:dollar]))
+                pos, level = dollar+2, 1
+                while level:
+                    match, pos = matchorfail(format, pos)
+                    tstart, tend = match.regs[3]
+                    token = format[tstart:tend]
+                    if token == "{": level = level+1
+                    elif token == "}": level = level-1
+                chunks.append((1, format[dollar+2:pos-1]))
+
+            elif nextchar in namechars:
+                chunks.append((0, format[pos:dollar]))
+                match, pos = matchorfail(format, dollar+1)
+                while pos < len(format):
+                    if format[pos] == "." and \
+                        pos+1 < len(format) and format[pos+1] in namechars:
+                        match, pos = matchorfail(format, pos+1)
+                    elif format[pos] in "([":
+                        pos, level = pos+1, 1
+                        while level:
+                            match, pos = matchorfail(format, pos)
+                            tstart, tend = match.regs[3]
+                            token = format[tstart:tend]
+                            if token[0] in "([": level = level+1
+                            elif token[0] in ")]": level = level-1
+                    else: break
+                chunks.append((1, format[dollar+1:pos]))
+
+            else:
+                chunks.append((0, format[pos:dollar+1]))
+                pos = dollar + 1 + (nextchar == "$")
+
+        if pos < len(format): chunks.append((0, format[pos:]))
+        self.chunks = chunks
+
+    def __repr__(self):
+        return "<Itpl %s >" % repr(self.format)
+
+    def _str(self,glob,loc):
+        """Evaluate to a string in the given globals/locals.
+
+        The final output is built by calling str(), but if this fails, the
+        result is encoded with the instance's codec and error handling policy,
+        via a call to out.encode(self.codec,self.encoding_errors)"""
+        result = []
+        app = result.append
+        for live, chunk in self.chunks:
+            if live: app(str(eval(chunk,glob,loc)))
+            else: app(chunk)
+        out = ''.join(result)
+        try:
+            return str(out)
+        except UnicodeError:
+            return out.encode(self.codec,self.encoding_errors)
+
+    def __str__(self):
+        """Evaluate and substitute the appropriate parts of the string."""
+
+        # We need to skip enough frames to get to the actual caller outside of
+        # Itpl.
+        frame = sys._getframe(1)
+        while frame.f_globals["__name__"] == __name__: frame = frame.f_back
+        loc, glob = frame.f_locals, frame.f_globals
+
+        return self._str(glob,loc)
+    
+class ItplNS(Itpl):
+    """Class representing a string with interpolation abilities.
+
+    This inherits from Itpl, but at creation time a namespace is provided
+    where the evaluation will occur.  The interpolation becomes a bit more
+    efficient, as no traceback needs to be extracte.  It also allows the
+    caller to supply a different namespace for the interpolation to occur than
+    its own."""
+    
+    def __init__(self, format,globals,locals=None,
+                 codec='utf_8',encoding_errors='backslashreplace'):
+        """ItplNS(format,globals[,locals]) -> interpolating string instance.
+
+        This constructor, besides a format string, takes a globals dictionary
+        and optionally a locals (which defaults to globals if not provided).
+
+        For further details, see the Itpl constructor."""
+
+        if locals is None:
+            locals = globals
+        self.globals = globals
+        self.locals = locals
+        Itpl.__init__(self,format,codec,encoding_errors)
+        
+    def __str__(self):
+        """Evaluate and substitute the appropriate parts of the string."""
+        return self._str(self.globals,self.locals)
+
+    def __repr__(self):
+        return "<ItplNS %s >" % repr(self.format)
+
+# utilities for fast printing
+def itpl(text): return str(Itpl(text))
+def printpl(text): print itpl(text)
+# versions with namespace
+def itplns(text,globals,locals=None): return str(ItplNS(text,globals,locals))
+def printplns(text,globals,locals=None): print itplns(text,globals,locals)
+
+class ItplFile:
+    """A file object that filters each write() through an interpolator."""
+    def __init__(self, file): self.file = file
+    def __repr__(self): return "<interpolated " + repr(self.file) + ">"
+    def __getattr__(self, attr): return getattr(self.file, attr)
+    def write(self, text): self.file.write(str(Itpl(text)))
+
+def filter(file=sys.stdout):
+    """Return an ItplFile that filters writes to the given file object.
+    
+    'file = filter(file)' replaces 'file' with a filtered object that
+    has a write() method.  When called with no argument, this creates
+    a filter to sys.stdout."""
+    return ItplFile(file)
+
+def unfilter(ifile=None):
+    """Return the original file that corresponds to the given ItplFile.
+    
+    'file = unfilter(file)' undoes the effect of 'file = filter(file)'.
+    'sys.stdout = unfilter()' undoes the effect of 'sys.stdout = filter()'."""
+    return ifile and ifile.file or sys.stdout.file
diff --git a/IPython/external/external/MochiKit/Async.js b/IPython/external/external/MochiKit/Async.js
new file mode 100644
index 0000000..bb2cc5e
--- /dev/null
+++ b/IPython/external/external/MochiKit/Async.js
@@ -0,0 +1,700 @@
+/***
+
+MochiKit.Async 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide("MochiKit.Async");
+    dojo.require("MochiKit.Base");
+}
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Async depends on MochiKit.Base!";
+}
+
+if (typeof(MochiKit.Async) == 'undefined') {
+    MochiKit.Async = {};
+}
+
+MochiKit.Async.NAME = "MochiKit.Async";
+MochiKit.Async.VERSION = "1.4";
+MochiKit.Async.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+MochiKit.Async.toString = function () {
+    return this.__repr__();
+};
+
+/** @id MochiKit.Async.Deferred */
+MochiKit.Async.Deferred = function (/* optional */ canceller) {
+    this.chain = [];
+    this.id = this._nextId();
+    this.fired = -1;
+    this.paused = 0;
+    this.results = [null, null];
+    this.canceller = canceller;
+    this.silentlyCancelled = false;
+    this.chained = false;
+};
+
+MochiKit.Async.Deferred.prototype = {
+    /** @id MochiKit.Async.Deferred.prototype.repr */
+    repr: function () {
+        var state;
+        if (this.fired == -1) {
+            state = 'unfired';
+        } else if (this.fired === 0) {
+            state = 'success';
+        } else {
+            state = 'error';
+        }
+        return 'Deferred(' + this.id + ', ' + state + ')';
+    },
+
+    toString: MochiKit.Base.forwardCall("repr"),
+
+    _nextId: MochiKit.Base.counter(),
+
+    /** @id MochiKit.Async.Deferred.prototype.cancel */
+    cancel: function () {
+        var self = MochiKit.Async;
+        if (this.fired == -1) {
+            if (this.canceller) {
+                this.canceller(this);
+            } else {
+                this.silentlyCancelled = true;
+            }
+            if (this.fired == -1) {
+                this.errback(new self.CancelledError(this));
+            }
+        } else if ((this.fired === 0) && (this.results[0] instanceof self.Deferred)) {
+            this.results[0].cancel();
+        }
+    },
+
+    _resback: function (res) {
+        /***
+
+        The primitive that means either callback or errback
+
+        ***/
+        this.fired = ((res instanceof Error) ? 1 : 0);
+        this.results[this.fired] = res;
+        this._fire();
+    },
+
+    _check: function () {
+        if (this.fired != -1) {
+            if (!this.silentlyCancelled) {
+                throw new MochiKit.Async.AlreadyCalledError(this);
+            }
+            this.silentlyCancelled = false;
+            return;
+        }
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.callback */
+    callback: function (res) {
+        this._check();
+        if (res instanceof MochiKit.Async.Deferred) {
+            throw new Error("Deferred instances can only be chained if they are the result of a callback");
+        }
+        this._resback(res);
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.errback */
+    errback: function (res) {
+        this._check();
+        var self = MochiKit.Async;
+        if (res instanceof self.Deferred) {
+            throw new Error("Deferred instances can only be chained if they are the result of a callback");
+        }
+        if (!(res instanceof Error)) {
+            res = new self.GenericError(res);
+        }
+        this._resback(res);
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.addBoth */
+    addBoth: function (fn) {
+        if (arguments.length > 1) {
+            fn = MochiKit.Base.partial.apply(null, arguments);
+        }
+        return this.addCallbacks(fn, fn);
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.addCallback */
+    addCallback: function (fn) {
+        if (arguments.length > 1) {
+            fn = MochiKit.Base.partial.apply(null, arguments);
+        }
+        return this.addCallbacks(fn, null);
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.addErrback */
+    addErrback: function (fn) {
+        if (arguments.length > 1) {
+            fn = MochiKit.Base.partial.apply(null, arguments);
+        }
+        return this.addCallbacks(null, fn);
+    },
+
+    /** @id MochiKit.Async.Deferred.prototype.addCallbacks */
+    addCallbacks: function (cb, eb) {
+        if (this.chained) {
+            throw new Error("Chained Deferreds can not be re-used");
+        }
+        this.chain.push([cb, eb]);
+        if (this.fired >= 0) {
+            this._fire();
+        }
+        return this;
+    },
+
+    _fire: function () {
+        /***
+
+        Used internally to exhaust the callback sequence when a result
+        is available.
+
+        ***/
+        var chain = this.chain;
+        var fired = this.fired;
+        var res = this.results[fired];
+        var self = this;
+        var cb = null;
+        while (chain.length > 0 && this.paused === 0) {
+            // Array
+            var pair = chain.shift();
+            var f = pair[fired];
+            if (f === null) {
+                continue;
+            }
+            try {
+                res = f(res);
+                fired = ((res instanceof Error) ? 1 : 0);
+                if (res instanceof MochiKit.Async.Deferred) {
+                    cb = function (res) {
+                        self._resback(res);
+                        self.paused--;
+                        if ((self.paused === 0) && (self.fired >= 0)) {
+                            self._fire();
+                        }
+                    };
+                    this.paused++;
+                }
+            } catch (err) {
+                fired = 1;
+                if (!(err instanceof Error)) {
+                    err = new MochiKit.Async.GenericError(err);
+                }
+                res = err;
+            }
+        }
+        this.fired = fired;
+        this.results[fired] = res;
+        if (cb && this.paused) {
+            // this is for "tail recursion" in case the dependent deferred
+            // is already fired
+            res.addBoth(cb);
+            res.chained = true;
+        }
+    }
+};
+
+MochiKit.Base.update(MochiKit.Async, {
+    /** @id MochiKit.Async.evalJSONRequest */
+    evalJSONRequest: function (req) {
+        return MochiKit.Base.evalJSON(req.responseText);
+    },
+
+    /** @id MochiKit.Async.succeed */
+    succeed: function (/* optional */result) {
+        var d = new MochiKit.Async.Deferred();
+        d.callback.apply(d, arguments);
+        return d;
+    },
+
+    /** @id MochiKit.Async.fail */
+    fail: function (/* optional */result) {
+        var d = new MochiKit.Async.Deferred();
+        d.errback.apply(d, arguments);
+        return d;
+    },
+
+    /** @id MochiKit.Async.getXMLHttpRequest */
+    getXMLHttpRequest: function () {
+        var self = arguments.callee;
+        if (!self.XMLHttpRequest) {
+            var tryThese = [
+                function () { return new XMLHttpRequest(); },
+                function () { return new ActiveXObject('Msxml2.XMLHTTP'); },
+                function () { return new ActiveXObject('Microsoft.XMLHTTP'); },
+                function () { return new ActiveXObject('Msxml2.XMLHTTP.4.0'); },
+                function () {
+                    throw new MochiKit.Async.BrowserComplianceError("Browser does not support XMLHttpRequest");
+                }
+            ];
+            for (var i = 0; i < tryThese.length; i++) {
+                var func = tryThese[i];
+                try {
+                    self.XMLHttpRequest = func;
+                    return func();
+                } catch (e) {
+                    // pass
+                }
+            }
+        }
+        return self.XMLHttpRequest();
+    },
+
+    _xhr_onreadystatechange: function (d) {
+        // MochiKit.Logging.logDebug('this.readyState', this.readyState);
+        var m = MochiKit.Base;
+        if (this.readyState == 4) {
+            // IE SUCKS
+            try {
+                this.onreadystatechange = null;
+            } catch (e) {
+                try {
+                    this.onreadystatechange = m.noop;
+                } catch (e) {
+                }
+            }
+            var status = null;
+            try {
+                status = this.status;
+                if (!status && m.isNotEmpty(this.responseText)) {
+                    // 0 or undefined seems to mean cached or local
+                    status = 304;
+                }
+            } catch (e) {
+                // pass
+                // MochiKit.Logging.logDebug('error getting status?', repr(items(e)));
+            }
+            // 200 is OK, 201 is CREATED, 204 is NO CONTENT
+            // 304 is NOT MODIFIED, 1223 is apparently a bug in IE
+            if (status == 200 || status == 201 || status == 204 ||
+                    status == 304 || status == 1223) {
+                d.callback(this);
+            } else {
+                var err = new MochiKit.Async.XMLHttpRequestError(this, "Request failed");
+                if (err.number) {
+                    // XXX: This seems to happen on page change
+                    d.errback(err);
+                } else {
+                    // XXX: this seems to happen when the server is unreachable
+                    d.errback(err);
+                }
+            }
+        }
+    },
+
+    _xhr_canceller: function (req) {
+        // IE SUCKS
+        try {
+            req.onreadystatechange = null;
+        } catch (e) {
+            try {
+                req.onreadystatechange = MochiKit.Base.noop;
+            } catch (e) {
+            }
+        }
+        req.abort();
+    },
+
+
+    /** @id MochiKit.Async.sendXMLHttpRequest */
+    sendXMLHttpRequest: function (req, /* optional */ sendContent) {
+        if (typeof(sendContent) == "undefined" || sendContent === null) {
+            sendContent = "";
+        }
+
+        var m = MochiKit.Base;
+        var self = MochiKit.Async;
+        var d = new self.Deferred(m.partial(self._xhr_canceller, req));
+
+        try {
+            req.onreadystatechange = m.bind(self._xhr_onreadystatechange,
+                req, d);
+            req.send(sendContent);
+        } catch (e) {
+            try {
+                req.onreadystatechange = null;
+            } catch (ignore) {
+                // pass
+            }
+            d.errback(e);
+        }
+
+        return d;
+
+    },
+
+    /** @id MochiKit.Async.doXHR */
+    doXHR: function (url, opts) {
+        /*
+            Work around a Firefox bug by dealing with XHR during
+            the next event loop iteration. Maybe it's this one:
+            https://bugzilla.mozilla.org/show_bug.cgi?id=249843
+        */
+        var self = MochiKit.Async;
+        return self.callLater(0, self._doXHR, url, opts);
+    },
+
+    _doXHR: function (url, opts) {
+        var m = MochiKit.Base;
+        opts = m.update({
+            method: 'GET',
+            sendContent: ''
+            /*
+            queryString: undefined,
+            username: undefined,
+            password: undefined,
+            headers: undefined,
+            mimeType: undefined
+            */
+        }, opts);
+        var self = MochiKit.Async;
+        var req = self.getXMLHttpRequest();
+        if (opts.queryString) {
+            var qs = m.queryString(opts.queryString);
+            if (qs) {
+                url += "?" + qs;
+            }
+        }
+        // Safari will send undefined:undefined, so we have to check.
+        // We can't use apply, since the function is native.
+        if ('username' in opts) {
+            req.open(opts.method, url, true, opts.username, opts.password);
+        } else {
+            req.open(opts.method, url, true);
+        }
+        if (req.overrideMimeType && opts.mimeType) {
+            req.overrideMimeType(opts.mimeType);
+        }
+        req.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        if (opts.headers) {
+            var headers = opts.headers;
+            if (!m.isArrayLike(headers)) {
+                headers = m.items(headers);
+            }
+            for (var i = 0; i < headers.length; i++) {
+                var header = headers[i];
+                var name = header[0];
+                var value = header[1];
+                req.setRequestHeader(name, value);
+            }
+        }
+        return self.sendXMLHttpRequest(req, opts.sendContent);
+    },
+
+    _buildURL: function (url/*, ...*/) {
+        if (arguments.length > 1) {
+            var m = MochiKit.Base;
+            var qs = m.queryString.apply(null, m.extend(null, arguments, 1));
+            if (qs) {
+                return url + "?" + qs;
+            }
+        }
+        return url;
+    },
+
+    /** @id MochiKit.Async.doSimpleXMLHttpRequest */
+    doSimpleXMLHttpRequest: function (url/*, ...*/) {
+        var self = MochiKit.Async;
+        url = self._buildURL.apply(self, arguments);
+        return self.doXHR(url);
+    },
+
+    /** @id MochiKit.Async.loadJSONDoc */
+    loadJSONDoc: function (url/*, ...*/) {
+        var self = MochiKit.Async;
+        url = self._buildURL.apply(self, arguments);
+        var d = self.doXHR(url, {
+            'mimeType': 'text/plain',
+            'headers': [['Accept', 'application/json']]
+        });
+        d = d.addCallback(self.evalJSONRequest);
+        return d;
+    },
+
+    /** @id MochiKit.Async.wait */
+    wait: function (seconds, /* optional */value) {
+        var d = new MochiKit.Async.Deferred();
+        var m = MochiKit.Base;
+        if (typeof(value) != 'undefined') {
+            d.addCallback(function () { return value; });
+        }
+        var timeout = setTimeout(
+            m.bind("callback", d),
+            Math.floor(seconds * 1000));
+        d.canceller = function () {
+            try {
+                clearTimeout(timeout);
+            } catch (e) {
+                // pass
+            }
+        };
+        return d;
+    },
+
+    /** @id MochiKit.Async.callLater */
+    callLater: function (seconds, func) {
+        var m = MochiKit.Base;
+        var pfunc = m.partial.apply(m, m.extend(null, arguments, 1));
+        return MochiKit.Async.wait(seconds).addCallback(
+            function (res) { return pfunc(); }
+        );
+    }
+});
+
+
+/** @id MochiKit.Async.DeferredLock */
+MochiKit.Async.DeferredLock = function () {
+    this.waiting = [];
+    this.locked = false;
+    this.id = this._nextId();
+};
+
+MochiKit.Async.DeferredLock.prototype = {
+    __class__: MochiKit.Async.DeferredLock,
+    /** @id MochiKit.Async.DeferredLock.prototype.acquire */
+    acquire: function () {
+        var d = new MochiKit.Async.Deferred();
+        if (this.locked) {
+            this.waiting.push(d);
+        } else {
+            this.locked = true;
+            d.callback(this);
+        }
+        return d;
+    },
+    /** @id MochiKit.Async.DeferredLock.prototype.release */
+    release: function () {
+        if (!this.locked) {
+            throw TypeError("Tried to release an unlocked DeferredLock");
+        }
+        this.locked = false;
+        if (this.waiting.length > 0) {
+            this.locked = true;
+            this.waiting.shift().callback(this);
+        }
+    },
+    _nextId: MochiKit.Base.counter(),
+    repr: function () {
+        var state;
+        if (this.locked) {
+            state = 'locked, ' + this.waiting.length + ' waiting';
+        } else {
+            state = 'unlocked';
+        }
+        return 'DeferredLock(' + this.id + ', ' + state + ')';
+    },
+    toString: MochiKit.Base.forwardCall("repr")
+
+};
+
+/** @id MochiKit.Async.DeferredList */
+MochiKit.Async.DeferredList = function (list, /* optional */fireOnOneCallback, fireOnOneErrback, consumeErrors, canceller) {
+
+    // call parent constructor
+    MochiKit.Async.Deferred.apply(this, [canceller]);
+
+    this.list = list;
+    var resultList = [];
+    this.resultList = resultList;
+
+    this.finishedCount = 0;
+    this.fireOnOneCallback = fireOnOneCallback;
+    this.fireOnOneErrback = fireOnOneErrback;
+    this.consumeErrors = consumeErrors;
+
+    var cb = MochiKit.Base.bind(this._cbDeferred, this);
+    for (var i = 0; i < list.length; i++) {
+        var d = list[i];
+        resultList.push(undefined);
+        d.addCallback(cb, i, true);
+        d.addErrback(cb, i, false);
+    }
+
+    if (list.length === 0 && !fireOnOneCallback) {
+        this.callback(this.resultList);
+    }
+
+};
+
+MochiKit.Async.DeferredList.prototype = new MochiKit.Async.Deferred();
+
+MochiKit.Async.DeferredList.prototype._cbDeferred = function (index, succeeded, result) {
+    this.resultList[index] = [succeeded, result];
+    this.finishedCount += 1;
+    if (this.fired == -1) {
+        if (succeeded && this.fireOnOneCallback) {
+            this.callback([index, result]);
+        } else if (!succeeded && this.fireOnOneErrback) {
+            this.errback(result);
+        } else if (this.finishedCount == this.list.length) {
+            this.callback(this.resultList);
+        }
+    }
+    if (!succeeded && this.consumeErrors) {
+        result = null;
+    }
+    return result;
+};
+
+/** @id MochiKit.Async.gatherResults */
+MochiKit.Async.gatherResults = function (deferredList) {
+    var d = new MochiKit.Async.DeferredList(deferredList, false, true, false);
+    d.addCallback(function (results) {
+        var ret = [];
+        for (var i = 0; i < results.length; i++) {
+            ret.push(results[i][1]);
+        }
+        return ret;
+    });
+    return d;
+};
+
+/** @id MochiKit.Async.maybeDeferred */
+MochiKit.Async.maybeDeferred = function (func) {
+    var self = MochiKit.Async;
+    var result;
+    try {
+        var r = func.apply(null, MochiKit.Base.extend([], arguments, 1));
+        if (r instanceof self.Deferred) {
+            result = r;
+        } else if (r instanceof Error) {
+            result = self.fail(r);
+        } else {
+            result = self.succeed(r);
+        }
+    } catch (e) {
+        result = self.fail(e);
+    }
+    return result;
+};
+
+
+MochiKit.Async.EXPORT = [
+    "AlreadyCalledError",
+    "CancelledError",
+    "BrowserComplianceError",
+    "GenericError",
+    "XMLHttpRequestError",
+    "Deferred",
+    "succeed",
+    "fail",
+    "getXMLHttpRequest",
+    "doSimpleXMLHttpRequest",
+    "loadJSONDoc",
+    "wait",
+    "callLater",
+    "sendXMLHttpRequest",
+    "DeferredLock",
+    "DeferredList",
+    "gatherResults",
+    "maybeDeferred",
+    "doXHR"
+];
+
+MochiKit.Async.EXPORT_OK = [
+    "evalJSONRequest"
+];
+
+MochiKit.Async.__new__ = function () {
+    var m = MochiKit.Base;
+    var ne = m.partial(m._newNamedError, this);
+
+    ne("AlreadyCalledError",
+        /** @id MochiKit.Async.AlreadyCalledError */
+        function (deferred) {
+            /***
+
+            Raised by the Deferred if callback or errback happens
+            after it was already fired.
+
+            ***/
+            this.deferred = deferred;
+        }
+    );
+
+    ne("CancelledError",
+        /** @id MochiKit.Async.CancelledError */
+        function (deferred) {
+            /***
+
+            Raised by the Deferred cancellation mechanism.
+
+            ***/
+            this.deferred = deferred;
+        }
+    );
+
+    ne("BrowserComplianceError",
+        /** @id MochiKit.Async.BrowserComplianceError */
+        function (msg) {
+            /***
+
+            Raised when the JavaScript runtime is not capable of performing
+            the given function.  Technically, this should really never be
+            raised because a non-conforming JavaScript runtime probably
+            isn't going to support exceptions in the first place.
+
+            ***/
+            this.message = msg;
+        }
+    );
+
+    ne("GenericError",
+        /** @id MochiKit.Async.GenericError */
+        function (msg) {
+            this.message = msg;
+        }
+    );
+
+    ne("XMLHttpRequestError",
+        /** @id MochiKit.Async.XMLHttpRequestError */
+        function (req, msg) {
+            /***
+
+            Raised when an XMLHttpRequest does not complete for any reason.
+
+            ***/
+            this.req = req;
+            this.message = msg;
+            try {
+                // Strange but true that this can raise in some cases.
+                this.number = req.status;
+            } catch (e) {
+                // pass
+            }
+        }
+    );
+
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+
+};
+
+MochiKit.Async.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Async);
diff --git a/IPython/external/external/MochiKit/Base.js b/IPython/external/external/MochiKit/Base.js
new file mode 100644
index 0000000..92351d4
--- /dev/null
+++ b/IPython/external/external/MochiKit/Base.js
@@ -0,0 +1,1413 @@
+/***
+
+MochiKit.Base 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide("MochiKit.Base");
+}
+if (typeof(MochiKit) == 'undefined') {
+    MochiKit = {};
+}
+if (typeof(MochiKit.Base) == 'undefined') {
+    MochiKit.Base = {};
+}
+if (typeof(MochiKit.__export__) == "undefined") {
+    MochiKit.__export__ = (MochiKit.__compat__  ||
+        (typeof(JSAN) == 'undefined' && typeof(dojo) == 'undefined')
+    );
+}
+
+MochiKit.Base.VERSION = "1.4";
+MochiKit.Base.NAME = "MochiKit.Base";
+/** @id MochiKit.Base.update */
+MochiKit.Base.update = function (self, obj/*, ... */) {
+    if (self === null || self === undefined) {
+        self = {};
+    }
+    for (var i = 1; i < arguments.length; i++) {
+        var o = arguments[i];
+        if (typeof(o) != 'undefined' && o !== null) {
+            for (var k in o) {
+                self[k] = o[k];
+            }
+        }
+    }
+    return self;
+};
+
+MochiKit.Base.update(MochiKit.Base, {
+    __repr__: function () {
+        return "[" + this.NAME + " " + this.VERSION + "]";
+    },
+
+    toString: function () {
+        return this.__repr__();
+    },
+
+    /** @id MochiKit.Base.camelize */
+    camelize: function (selector) {
+        /* from dojo.style.toCamelCase */
+        var arr = selector.split('-');
+        var cc = arr[0];
+        for (var i = 1; i < arr.length; i++) {
+            cc += arr[i].charAt(0).toUpperCase() + arr[i].substring(1);
+        }
+        return cc;
+    },
+
+    /** @id MochiKit.Base.counter */
+    counter: function (n/* = 1 */) {
+        if (arguments.length === 0) {
+            n = 1;
+        }
+        return function () {
+            return n++;
+        };
+    },
+
+    /** @id MochiKit.Base.clone */
+    clone: function (obj) {
+        var me = arguments.callee;
+        if (arguments.length == 1) {
+            me.prototype = obj;
+            return new me();
+        }
+    },
+
+    _flattenArray: function (res, lst) {
+        for (var i = 0; i < lst.length; i++) {
+            var o = lst[i];
+            if (o instanceof Array) {
+                arguments.callee(res, o);
+            } else {
+                res.push(o);
+            }
+        }
+        return res;
+    },
+
+    /** @id MochiKit.Base.flattenArray */
+    flattenArray: function (lst) {
+        return MochiKit.Base._flattenArray([], lst);
+    },
+
+    /** @id MochiKit.Base.flattenArguments */
+    flattenArguments: function (lst/* ...*/) {
+        var res = [];
+        var m = MochiKit.Base;
+        var args = m.extend(null, arguments);
+        while (args.length) {
+            var o = args.shift();
+            if (o && typeof(o) == "object" && typeof(o.length) == "number") {
+                for (var i = o.length - 1; i >= 0; i--) {
+                    args.unshift(o[i]);
+                }
+            } else {
+                res.push(o);
+            }
+        }
+        return res;
+    },
+
+    /** @id MochiKit.Base.extend */
+    extend: function (self, obj, /* optional */skip) {
+        // Extend an array with an array-like object starting
+        // from the skip index
+        if (!skip) {
+            skip = 0;
+        }
+        if (obj) {
+            // allow iterable fall-through, but skip the full isArrayLike
+            // check for speed, this is called often.
+            var l = obj.length;
+            if (typeof(l) != 'number' /* !isArrayLike(obj) */) {
+                if (typeof(MochiKit.Iter) != "undefined") {
+                    obj = MochiKit.Iter.list(obj);
+                    l = obj.length;
+                } else {
+                    throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
+                }
+            }
+            if (!self) {
+                self = [];
+            }
+            for (var i = skip; i < l; i++) {
+                self.push(obj[i]);
+            }
+        }
+        // This mutates, but it's convenient to return because
+        // it's often used like a constructor when turning some
+        // ghetto array-like to a real array
+        return self;
+    },
+
+
+    /** @id MochiKit.Base.updatetree */
+    updatetree: function (self, obj/*, ...*/) {
+        if (self === null || self === undefined) {
+            self = {};
+        }
+        for (var i = 1; i < arguments.length; i++) {
+            var o = arguments[i];
+            if (typeof(o) != 'undefined' && o !== null) {
+                for (var k in o) {
+                    var v = o[k];
+                    if (typeof(self[k]) == 'object' && typeof(v) == 'object') {
+                        arguments.callee(self[k], v);
+                    } else {
+                        self[k] = v;
+                    }
+                }
+            }
+        }
+        return self;
+    },
+
+    /** @id MochiKit.Base.setdefault */
+    setdefault: function (self, obj/*, ...*/) {
+        if (self === null || self === undefined) {
+            self = {};
+        }
+        for (var i = 1; i < arguments.length; i++) {
+            var o = arguments[i];
+            for (var k in o) {
+                if (!(k in self)) {
+                    self[k] = o[k];
+                }
+            }
+        }
+        return self;
+    },
+
+    /** @id MochiKit.Base.keys */
+    keys: function (obj) {
+        var rval = [];
+        for (var prop in obj) {
+            rval.push(prop);
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Base.values */
+    values: function (obj) {
+        var rval = [];
+        for (var prop in obj) {
+            rval.push(obj[prop]);
+        }
+        return rval;
+    },
+
+     /** @id MochiKit.Base.items */
+    items: function (obj) {
+        var rval = [];
+        var e;
+        for (var prop in obj) {
+            var v;
+            try {
+                v = obj[prop];
+            } catch (e) {
+                continue;
+            }
+            rval.push([prop, v]);
+        }
+        return rval;
+    },
+
+
+    _newNamedError: function (module, name, func) {
+        func.prototype = new MochiKit.Base.NamedError(module.NAME + "." + name);
+        module[name] = func;
+    },
+
+
+    /** @id MochiKit.Base.operator */
+    operator: {
+        // unary logic operators
+        /** @id MochiKit.Base.truth */
+        truth: function (a) { return !!a; },
+        /** @id MochiKit.Base.lognot */
+        lognot: function (a) { return !a; },
+        /** @id MochiKit.Base.identity */
+        identity: function (a) { return a; },
+
+        // bitwise unary operators
+        /** @id MochiKit.Base.not */
+        not: function (a) { return ~a; },
+        /** @id MochiKit.Base.neg */
+        neg: function (a) { return -a; },
+
+        // binary operators
+        /** @id MochiKit.Base.add */
+        add: function (a, b) { return a + b; },
+        /** @id MochiKit.Base.sub */
+        sub: function (a, b) { return a - b; },
+        /** @id MochiKit.Base.div */
+        div: function (a, b) { return a / b; },
+        /** @id MochiKit.Base.mod */
+        mod: function (a, b) { return a % b; },
+        /** @id MochiKit.Base.mul */
+        mul: function (a, b) { return a * b; },
+
+        // bitwise binary operators
+        /** @id MochiKit.Base.and */
+        and: function (a, b) { return a & b; },
+        /** @id MochiKit.Base.or */
+        or: function (a, b) { return a | b; },
+        /** @id MochiKit.Base.xor */
+        xor: function (a, b) { return a ^ b; },
+        /** @id MochiKit.Base.lshift */
+        lshift: function (a, b) { return a << b; },
+        /** @id MochiKit.Base.rshift */
+        rshift: function (a, b) { return a >> b; },
+        /** @id MochiKit.Base.zrshift */
+        zrshift: function (a, b) { return a >>> b; },
+
+        // near-worthless built-in comparators
+        /** @id MochiKit.Base.eq */
+        eq: function (a, b) { return a == b; },
+        /** @id MochiKit.Base.ne */
+        ne: function (a, b) { return a != b; },
+        /** @id MochiKit.Base.gt */
+        gt: function (a, b) { return a > b; },
+        /** @id MochiKit.Base.ge */
+        ge: function (a, b) { return a >= b; },
+        /** @id MochiKit.Base.lt */
+        lt: function (a, b) { return a < b; },
+        /** @id MochiKit.Base.le */
+        le: function (a, b) { return a <= b; },
+
+        // strict built-in comparators
+        seq: function (a, b) { return a === b; },
+        sne: function (a, b) { return a !== b; },
+
+        // compare comparators
+        /** @id MochiKit.Base.ceq */
+        ceq: function (a, b) { return MochiKit.Base.compare(a, b) === 0; },
+        /** @id MochiKit.Base.cne */
+        cne: function (a, b) { return MochiKit.Base.compare(a, b) !== 0; },
+        /** @id MochiKit.Base.cgt */
+        cgt: function (a, b) { return MochiKit.Base.compare(a, b) == 1; },
+        /** @id MochiKit.Base.cge */
+        cge: function (a, b) { return MochiKit.Base.compare(a, b) != -1; },
+        /** @id MochiKit.Base.clt */
+        clt: function (a, b) { return MochiKit.Base.compare(a, b) == -1; },
+        /** @id MochiKit.Base.cle */
+        cle: function (a, b) { return MochiKit.Base.compare(a, b) != 1; },
+
+        // binary logical operators
+        /** @id MochiKit.Base.logand */
+        logand: function (a, b) { return a && b; },
+        /** @id MochiKit.Base.logor */
+        logor: function (a, b) { return a || b; },
+        /** @id MochiKit.Base.contains */
+        contains: function (a, b) { return b in a; }
+    },
+
+    /** @id MochiKit.Base.forwardCall */
+    forwardCall: function (func) {
+        return function () {
+            return this[func].apply(this, arguments);
+        };
+    },
+
+    /** @id MochiKit.Base.itemgetter */
+    itemgetter: function (func) {
+        return function (arg) {
+            return arg[func];
+        };
+    },
+
+    /** @id MochiKit.Base.typeMatcher */
+    typeMatcher: function (/* typ */) {
+        var types = {};
+        for (var i = 0; i < arguments.length; i++) {
+            var typ = arguments[i];
+            types[typ] = typ;
+        }
+        return function () {
+            for (var i = 0; i < arguments.length; i++) {
+                if (!(typeof(arguments[i]) in types)) {
+                    return false;
+                }
+            }
+            return true;
+        };
+    },
+
+    /** @id MochiKit.Base.isNull */
+    isNull: function (/* ... */) {
+        for (var i = 0; i < arguments.length; i++) {
+            if (arguments[i] !== null) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.Base.isUndefinedOrNull */
+    isUndefinedOrNull: function (/* ... */) {
+        for (var i = 0; i < arguments.length; i++) {
+            var o = arguments[i];
+            if (!(typeof(o) == 'undefined' || o === null)) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.Base.isEmpty */
+    isEmpty: function (obj) {
+        return !MochiKit.Base.isNotEmpty.apply(this, arguments);
+    },
+
+    /** @id MochiKit.Base.isNotEmpty */
+    isNotEmpty: function (obj) {
+        for (var i = 0; i < arguments.length; i++) {
+            var o = arguments[i];
+            if (!(o && o.length)) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.Base.isArrayLike */
+    isArrayLike: function () {
+        for (var i = 0; i < arguments.length; i++) {
+            var o = arguments[i];
+            var typ = typeof(o);
+            if (
+                (typ != 'object' && !(typ == 'function' && typeof(o.item) == 'function')) ||
+                o === null ||
+                typeof(o.length) != 'number' ||
+                o.nodeType === 3
+            ) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.Base.isDateLike */
+    isDateLike: function () {
+        for (var i = 0; i < arguments.length; i++) {
+            var o = arguments[i];
+            if (typeof(o) != "object" || o === null
+                    || typeof(o.getTime) != 'function') {
+                return false;
+            }
+        }
+        return true;
+    },
+
+
+    /** @id MochiKit.Base.xmap */
+    xmap: function (fn/*, obj... */) {
+        if (fn === null) {
+            return MochiKit.Base.extend(null, arguments, 1);
+        }
+        var rval = [];
+        for (var i = 1; i < arguments.length; i++) {
+            rval.push(fn(arguments[i]));
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Base.map */
+    map: function (fn, lst/*, lst... */) {
+        var m = MochiKit.Base;
+        var itr = MochiKit.Iter;
+        var isArrayLike = m.isArrayLike;
+        if (arguments.length <= 2) {
+            // allow an iterable to be passed
+            if (!isArrayLike(lst)) {
+                if (itr) {
+                    // fast path for map(null, iterable)
+                    lst = itr.list(lst);
+                    if (fn === null) {
+                        return lst;
+                    }
+                } else {
+                    throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
+                }
+            }
+            // fast path for map(null, lst)
+            if (fn === null) {
+                return m.extend(null, lst);
+            }
+            // disabled fast path for map(fn, lst)
+            /*
+            if (false && typeof(Array.prototype.map) == 'function') {
+                // Mozilla fast-path
+                return Array.prototype.map.call(lst, fn);
+            }
+            */
+            var rval = [];
+            for (var i = 0; i < lst.length; i++) {
+                rval.push(fn(lst[i]));
+            }
+            return rval;
+        } else {
+            // default for map(null, ...) is zip(...)
+            if (fn === null) {
+                fn = Array;
+            }
+            var length = null;
+            for (i = 1; i < arguments.length; i++) {
+                // allow iterables to be passed
+                if (!isArrayLike(arguments[i])) {
+                    if (itr) {
+                        return itr.list(itr.imap.apply(null, arguments));
+                    } else {
+                        throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
+                    }
+                }
+                // find the minimum length
+                var l = arguments[i].length;
+                if (length === null || length > l) {
+                    length = l;
+                }
+            }
+            rval = [];
+            for (i = 0; i < length; i++) {
+                var args = [];
+                for (var j = 1; j < arguments.length; j++) {
+                    args.push(arguments[j][i]);
+                }
+                rval.push(fn.apply(this, args));
+            }
+            return rval;
+        }
+    },
+
+    /** @id MochiKit.Base.xfilter */
+    xfilter: function (fn/*, obj... */) {
+        var rval = [];
+        if (fn === null) {
+            fn = MochiKit.Base.operator.truth;
+        }
+        for (var i = 1; i < arguments.length; i++) {
+            var o = arguments[i];
+            if (fn(o)) {
+                rval.push(o);
+            }
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Base.filter */
+    filter: function (fn, lst, self) {
+        var rval = [];
+        // allow an iterable to be passed
+        var m = MochiKit.Base;
+        if (!m.isArrayLike(lst)) {
+            if (MochiKit.Iter) {
+                lst = MochiKit.Iter.list(lst);
+            } else {
+                throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
+            }
+        }
+        if (fn === null) {
+            fn = m.operator.truth;
+        }
+        if (typeof(Array.prototype.filter) == 'function') {
+            // Mozilla fast-path
+            return Array.prototype.filter.call(lst, fn, self);
+        } else if (typeof(self) == 'undefined' || self === null) {
+            for (var i = 0; i < lst.length; i++) {
+                var o = lst[i];
+                if (fn(o)) {
+                    rval.push(o);
+                }
+            }
+        } else {
+            for (i = 0; i < lst.length; i++) {
+                o = lst[i];
+                if (fn.call(self, o)) {
+                    rval.push(o);
+                }
+            }
+        }
+        return rval;
+    },
+
+
+    _wrapDumbFunction: function (func) {
+        return function () {
+            // fast path!
+            switch (arguments.length) {
+                case 0: return func();
+                case 1: return func(arguments[0]);
+                case 2: return func(arguments[0], arguments[1]);
+                case 3: return func(arguments[0], arguments[1], arguments[2]);
+            }
+            var args = [];
+            for (var i = 0; i < arguments.length; i++) {
+                args.push("arguments[" + i + "]");
+            }
+            return eval("(func(" + args.join(",") + "))");
+        };
+    },
+
+    /** @id MochiKit.Base.methodcaller */
+    methodcaller: function (func/*, args... */) {
+        var args = MochiKit.Base.extend(null, arguments, 1);
+        if (typeof(func) == "function") {
+            return function (obj) {
+                return func.apply(obj, args);
+            };
+        } else {
+            return function (obj) {
+                return obj[func].apply(obj, args);
+            };
+        }
+    },
+
+    /** @id MochiKit.Base.method */
+    method: function (self, func) {
+        var m = MochiKit.Base;
+        return m.bind.apply(this, m.extend([func, self], arguments, 2));
+    },
+
+    /** @id MochiKit.Base.compose */
+    compose: function (f1, f2/*, f3, ... fN */) {
+        var fnlist = [];
+        var m = MochiKit.Base;
+        if (arguments.length === 0) {
+            throw new TypeError("compose() requires at least one argument");
+        }
+        for (var i = 0; i < arguments.length; i++) {
+            var fn = arguments[i];
+            if (typeof(fn) != "function") {
+                throw new TypeError(m.repr(fn) + " is not a function");
+            }
+            fnlist.push(fn);
+        }
+        return function () {
+            var args = arguments;
+            for (var i = fnlist.length - 1; i >= 0; i--) {
+                args = [fnlist[i].apply(this, args)];
+            }
+            return args[0];
+        };
+    },
+
+    /** @id MochiKit.Base.bind */
+    bind: function (func, self/* args... */) {
+        if (typeof(func) == "string") {
+            func = self[func];
+        }
+        var im_func = func.im_func;
+        var im_preargs = func.im_preargs;
+        var im_self = func.im_self;
+        var m = MochiKit.Base;
+        if (typeof(func) == "function" && typeof(func.apply) == "undefined") {
+            // this is for cases where JavaScript sucks ass and gives you a
+            // really dumb built-in function like alert() that doesn't have
+            // an apply
+            func = m._wrapDumbFunction(func);
+        }
+        if (typeof(im_func) != 'function') {
+            im_func = func;
+        }
+        if (typeof(self) != 'undefined') {
+            im_self = self;
+        }
+        if (typeof(im_preargs) == 'undefined') {
+            im_preargs = [];
+        } else  {
+            im_preargs = im_preargs.slice();
+        }
+        m.extend(im_preargs, arguments, 2);
+        var newfunc = function () {
+            var args = arguments;
+            var me = arguments.callee;
+            if (me.im_preargs.length > 0) {
+                args = m.concat(me.im_preargs, args);
+            }
+            var self = me.im_self;
+            if (!self) {
+                self = this;
+            }
+            return me.im_func.apply(self, args);
+        };
+        newfunc.im_self = im_self;
+        newfunc.im_func = im_func;
+        newfunc.im_preargs = im_preargs;
+        return newfunc;
+    },
+
+    /** @id MochiKit.Base.bindMethods */
+    bindMethods: function (self) {
+        var bind = MochiKit.Base.bind;
+        for (var k in self) {
+            var func = self[k];
+            if (typeof(func) == 'function') {
+                self[k] = bind(func, self);
+            }
+        }
+    },
+
+    /** @id MochiKit.Base.registerComparator */
+    registerComparator: function (name, check, comparator, /* optional */ override) {
+        MochiKit.Base.comparatorRegistry.register(name, check, comparator, override);
+    },
+
+    _primitives: {'boolean': true, 'string': true, 'number': true},
+
+    /** @id MochiKit.Base.compare */
+    compare: function (a, b) {
+        if (a == b) {
+            return 0;
+        }
+        var aIsNull = (typeof(a) == 'undefined' || a === null);
+        var bIsNull = (typeof(b) == 'undefined' || b === null);
+        if (aIsNull && bIsNull) {
+            return 0;
+        } else if (aIsNull) {
+            return -1;
+        } else if (bIsNull) {
+            return 1;
+        }
+        var m = MochiKit.Base;
+        // bool, number, string have meaningful comparisons
+        var prim = m._primitives;
+        if (!(typeof(a) in prim && typeof(b) in prim)) {
+            try {
+                return m.comparatorRegistry.match(a, b);
+            } catch (e) {
+                if (e != m.NotFound) {
+                    throw e;
+                }
+            }
+        }
+        if (a < b) {
+            return -1;
+        } else if (a > b) {
+            return 1;
+        }
+        // These types can't be compared
+        var repr = m.repr;
+        throw new TypeError(repr(a) + " and " + repr(b) + " can not be compared");
+    },
+
+    /** @id MochiKit.Base.compareDateLike */
+    compareDateLike: function (a, b) {
+        return MochiKit.Base.compare(a.getTime(), b.getTime());
+    },
+
+    /** @id MochiKit.Base.compareArrayLike */
+    compareArrayLike: function (a, b) {
+        var compare = MochiKit.Base.compare;
+        var count = a.length;
+        var rval = 0;
+        if (count > b.length) {
+            rval = 1;
+            count = b.length;
+        } else if (count < b.length) {
+            rval = -1;
+        }
+        for (var i = 0; i < count; i++) {
+            var cmp = compare(a[i], b[i]);
+            if (cmp) {
+                return cmp;
+            }
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Base.registerRepr */
+    registerRepr: function (name, check, wrap, /* optional */override) {
+        MochiKit.Base.reprRegistry.register(name, check, wrap, override);
+    },
+
+    /** @id MochiKit.Base.repr */
+    repr: function (o) {
+        if (typeof(o) == "undefined") {
+            return "undefined";
+        } else if (o === null) {
+            return "null";
+        }
+        try {
+            if (typeof(o.__repr__) == 'function') {
+                return o.__repr__();
+            } else if (typeof(o.repr) == 'function' && o.repr != arguments.callee) {
+                return o.repr();
+            }
+            return MochiKit.Base.reprRegistry.match(o);
+        } catch (e) {
+            if (typeof(o.NAME) == 'string' && (
+                    o.toString == Function.prototype.toString ||
+                    o.toString == Object.prototype.toString
+                )) {
+                return o.NAME;
+            }
+        }
+        try {
+            var ostring = (o + "");
+        } catch (e) {
+            return "[" + typeof(o) + "]";
+        }
+        if (typeof(o) == "function") {
+            ostring = ostring.replace(/^\s+/, "").replace(/\s+/g, " ");
+            var idx = ostring.indexOf("{");
+            if (idx != -1) {
+                ostring = ostring.substr(0, idx) + "{...}";
+            }
+        }
+        return ostring;
+    },
+
+    /** @id MochiKit.Base.reprArrayLike */
+    reprArrayLike: function (o) {
+        var m = MochiKit.Base;
+        return "[" + m.map(m.repr, o).join(", ") + "]";
+    },
+
+    /** @id MochiKit.Base.reprString */
+    reprString: function (o) {
+        return ('"' + o.replace(/(["\\])/g, '\\$1') + '"'
+            ).replace(/[\f]/g, "\\f"
+            ).replace(/[\b]/g, "\\b"
+            ).replace(/[\n]/g, "\\n"
+            ).replace(/[\t]/g, "\\t"
+            ).replace(/[\r]/g, "\\r");
+    },
+
+    /** @id MochiKit.Base.reprNumber */
+    reprNumber: function (o) {
+        return o + "";
+    },
+
+    /** @id MochiKit.Base.registerJSON */
+    registerJSON: function (name, check, wrap, /* optional */override) {
+        MochiKit.Base.jsonRegistry.register(name, check, wrap, override);
+    },
+
+
+    /** @id MochiKit.Base.evalJSON */
+    evalJSON: function () {
+        return eval("(" + MochiKit.Base._filterJSON(arguments[0]) + ")");
+    },
+
+    _filterJSON: function (s) {
+        var m = s.match(/^\s*\/\*(.*)\*\/\s*$/);
+        if (m) {
+            return m[1];
+        }
+        return s;
+    },
+
+    /** @id MochiKit.Base.serializeJSON */
+    serializeJSON: function (o) {
+        var objtype = typeof(o);
+        if (objtype == "number" || objtype == "boolean") {
+            return o + "";
+        } else if (o === null) {
+            return "null";
+        }
+        var m = MochiKit.Base;
+        var reprString = m.reprString;
+        if (objtype == "string") {
+            return reprString(o);
+        }
+        // recurse
+        var me = arguments.callee;
+        // short-circuit for objects that support "json" serialization
+        // if they return "self" then just pass-through...
+        var newObj;
+        if (typeof(o.__json__) == "function") {
+            newObj = o.__json__();
+            if (o !== newObj) {
+                return me(newObj);
+            }
+        }
+        if (typeof(o.json) == "function") {
+            newObj = o.json();
+            if (o !== newObj) {
+                return me(newObj);
+            }
+        }
+        // array
+        if (objtype != "function" && typeof(o.length) == "number") {
+            var res = [];
+            for (var i = 0; i < o.length; i++) {
+                var val = me(o[i]);
+                if (typeof(val) != "string") {
+                    val = "undefined";
+                }
+                res.push(val);
+            }
+            return "[" + res.join(", ") + "]";
+        }
+        // look in the registry
+        try {
+            newObj = m.jsonRegistry.match(o);
+            if (o !== newObj) {
+                return me(newObj);
+            }
+        } catch (e) {
+            if (e != m.NotFound) {
+                // something really bad happened
+                throw e;
+            }
+        }
+        // undefined is outside of the spec
+        if (objtype == "undefined") {
+            throw new TypeError("undefined can not be serialized as JSON");
+        }
+        // it's a function with no adapter, bad
+        if (objtype == "function") {
+            return null;
+        }
+        // generic object code path
+        res = [];
+        for (var k in o) {
+            var useKey;
+            if (typeof(k) == "number") {
+                useKey = '"' + k + '"';
+            } else if (typeof(k) == "string") {
+                useKey = reprString(k);
+            } else {
+                // skip non-string or number keys
+                continue;
+            }
+            val = me(o[k]);
+            if (typeof(val) != "string") {
+                // skip non-serializable values
+                continue;
+            }
+            res.push(useKey + ":" + val);
+        }
+        return "{" + res.join(", ") + "}";
+    },
+
+
+    /** @id MochiKit.Base.objEqual */
+    objEqual: function (a, b) {
+        return (MochiKit.Base.compare(a, b) === 0);
+    },
+
+    /** @id MochiKit.Base.arrayEqual */
+    arrayEqual: function (self, arr) {
+        if (self.length != arr.length) {
+            return false;
+        }
+        return (MochiKit.Base.compare(self, arr) === 0);
+    },
+
+    /** @id MochiKit.Base.concat */
+    concat: function (/* lst... */) {
+        var rval = [];
+        var extend = MochiKit.Base.extend;
+        for (var i = 0; i < arguments.length; i++) {
+            extend(rval, arguments[i]);
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Base.keyComparator */
+    keyComparator: function (key/* ... */) {
+        // fast-path for single key comparisons
+        var m = MochiKit.Base;
+        var compare = m.compare;
+        if (arguments.length == 1) {
+            return function (a, b) {
+                return compare(a[key], b[key]);
+            };
+        }
+        var compareKeys = m.extend(null, arguments);
+        return function (a, b) {
+            var rval = 0;
+            // keep comparing until something is inequal or we run out of
+            // keys to compare
+            for (var i = 0; (rval === 0) && (i < compareKeys.length); i++) {
+                var key = compareKeys[i];
+                rval = compare(a[key], b[key]);
+            }
+            return rval;
+        };
+    },
+
+    /** @id MochiKit.Base.reverseKeyComparator */
+    reverseKeyComparator: function (key) {
+        var comparator = MochiKit.Base.keyComparator.apply(this, arguments);
+        return function (a, b) {
+            return comparator(b, a);
+        };
+    },
+
+    /** @id MochiKit.Base.partial */
+    partial: function (func) {
+        var m = MochiKit.Base;
+        return m.bind.apply(this, m.extend([func, undefined], arguments, 1));
+    },
+
+    /** @id MochiKit.Base.listMinMax */
+    listMinMax: function (which, lst) {
+        if (lst.length === 0) {
+            return null;
+        }
+        var cur = lst[0];
+        var compare = MochiKit.Base.compare;
+        for (var i = 1; i < lst.length; i++) {
+            var o = lst[i];
+            if (compare(o, cur) == which) {
+                cur = o;
+            }
+        }
+        return cur;
+    },
+
+    /** @id MochiKit.Base.objMax */
+    objMax: function (/* obj... */) {
+        return MochiKit.Base.listMinMax(1, arguments);
+    },
+
+    /** @id MochiKit.Base.objMin */
+    objMin: function (/* obj... */) {
+        return MochiKit.Base.listMinMax(-1, arguments);
+    },
+
+    /** @id MochiKit.Base.findIdentical */
+    findIdentical: function (lst, value, start/* = 0 */, /* optional */end) {
+        if (typeof(end) == "undefined" || end === null) {
+            end = lst.length;
+        }
+        if (typeof(start) == "undefined" || start === null) {
+            start = 0;
+        }
+        for (var i = start; i < end; i++) {
+            if (lst[i] === value) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+    /** @id MochiKit.Base.mean */
+    mean: function(/* lst... */) {
+        /* http://www.nist.gov/dads/HTML/mean.html */
+        var sum = 0;
+
+        var m = MochiKit.Base;
+        var args = m.extend(null, arguments);
+        var count = args.length;
+
+        while (args.length) {
+            var o = args.shift();
+            if (o && typeof(o) == "object" && typeof(o.length) == "number") {
+                count += o.length - 1;
+                for (var i = o.length - 1; i >= 0; i--) {
+                    sum += o[i];
+                }
+            } else {
+                sum += o;
+            }
+        }
+
+        if (count <= 0) {
+            throw new TypeError('mean() requires at least one argument');
+        }
+
+        return sum/count;
+    },
+
+    /** @id MochiKit.Base.median */
+    median: function(/* lst... */) {
+        /* http://www.nist.gov/dads/HTML/median.html */
+        var data = MochiKit.Base.flattenArguments(arguments);
+        if (data.length === 0) {
+            throw new TypeError('median() requires at least one argument');
+        }
+        data.sort(compare);
+        if (data.length % 2 == 0) {
+            var upper = data.length / 2;
+            return (data[upper] + data[upper - 1]) / 2;
+        } else {
+            return data[(data.length - 1) / 2];
+        }
+    },
+
+    /** @id MochiKit.Base.findValue */
+    findValue: function (lst, value, start/* = 0 */, /* optional */end) {
+        if (typeof(end) == "undefined" || end === null) {
+            end = lst.length;
+        }
+        if (typeof(start) == "undefined" || start === null) {
+            start = 0;
+        }
+        var cmp = MochiKit.Base.compare;
+        for (var i = start; i < end; i++) {
+            if (cmp(lst[i], value) === 0) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+    /** @id MochiKit.Base.nodeWalk */
+    nodeWalk: function (node, visitor) {
+        var nodes = [node];
+        var extend = MochiKit.Base.extend;
+        while (nodes.length) {
+            var res = visitor(nodes.shift());
+            if (res) {
+                extend(nodes, res);
+            }
+        }
+    },
+
+
+    /** @id MochiKit.Base.nameFunctions */
+    nameFunctions: function (namespace) {
+        var base = namespace.NAME;
+        if (typeof(base) == 'undefined') {
+            base = '';
+        } else {
+            base = base + '.';
+        }
+        for (var name in namespace) {
+            var o = namespace[name];
+            if (typeof(o) == 'function' && typeof(o.NAME) == 'undefined') {
+                try {
+                    o.NAME = base + name;
+                } catch (e) {
+                    // pass
+                }
+            }
+        }
+    },
+
+
+    /** @id MochiKit.Base.queryString */
+    queryString: function (names, values) {
+        // check to see if names is a string or a DOM element, and if
+        // MochiKit.DOM is available.  If so, drop it like it's a form
+        // Ugliest conditional in MochiKit?  Probably!
+        if (typeof(MochiKit.DOM) != "undefined" && arguments.length == 1
+            && (typeof(names) == "string" || (
+                typeof(names.nodeType) != "undefined" && names.nodeType > 0
+            ))
+        ) {
+            var kv = MochiKit.DOM.formContents(names);
+            names = kv[0];
+            values = kv[1];
+        } else if (arguments.length == 1) {
+            // Allow the return value of formContents to be passed directly
+            if (typeof(names.length) == "number" && names.length == 2) {
+                return arguments.callee(names[0], names[1]);
+            }
+            var o = names;
+            names = [];
+            values = [];
+            for (var k in o) {
+                var v = o[k];
+                if (typeof(v) == "function") {
+                    continue;
+                } else if (MochiKit.Base.isArrayLike(v)){
+                    for (var i = 0; i < v.length; i++) {
+                        names.push(k);
+                        values.push(v[i]);
+                    }
+                } else {
+                    names.push(k);
+                    values.push(v);
+                }
+            }
+        }
+        var rval = [];
+        var len = Math.min(names.length, values.length);
+        var urlEncode = MochiKit.Base.urlEncode;
+        for (var i = 0; i < len; i++) {
+            v = values[i];
+            if (typeof(v) != 'undefined' && v !== null) {
+                rval.push(urlEncode(names[i]) + "=" + urlEncode(v));
+            }
+        }
+        return rval.join("&");
+    },
+
+
+    /** @id MochiKit.Base.parseQueryString */
+    parseQueryString: function (encodedString, useArrays) {
+        // strip a leading '?' from the encoded string
+        var qstr = (encodedString.charAt(0) == "?")
+            ? encodedString.substring(1)
+            : encodedString;
+        var pairs = qstr.replace(/\+/g, "%20").split(/(\&amp\;|\&\#38\;|\&#x26;|\&)/);
+        var o = {};
+        var decode;
+        if (typeof(decodeURIComponent) != "undefined") {
+            decode = decodeURIComponent;
+        } else {
+            decode = unescape;
+        }
+        if (useArrays) {
+            for (var i = 0; i < pairs.length; i++) {
+                var pair = pairs[i].split("=");
+                var name = decode(pair.shift());
+                if (!name) {
+                    continue;
+                }
+                var arr = o[name];
+                if (!(arr instanceof Array)) {
+                    arr = [];
+                    o[name] = arr;
+                }
+                arr.push(decode(pair.join("=")));
+            }
+        } else {
+            for (i = 0; i < pairs.length; i++) {
+                pair = pairs[i].split("=");
+                var name = pair.shift();
+                if (!name) {
+                    continue;
+                }
+                o[decode(name)] = decode(pair.join("="));
+            }
+        }
+        return o;
+    }
+});
+
+/** @id MochiKit.Base.AdapterRegistry */
+MochiKit.Base.AdapterRegistry = function () {
+    this.pairs = [];
+};
+
+MochiKit.Base.AdapterRegistry.prototype = {
+    /** @id MochiKit.Base.AdapterRegistry.prototype.register */
+    register: function (name, check, wrap, /* optional */ override) {
+        if (override) {
+            this.pairs.unshift([name, check, wrap]);
+        } else {
+            this.pairs.push([name, check, wrap]);
+        }
+    },
+
+    /** @id MochiKit.Base.AdapterRegistry.prototype.match */
+    match: function (/* ... */) {
+        for (var i = 0; i < this.pairs.length; i++) {
+            var pair = this.pairs[i];
+            if (pair[1].apply(this, arguments)) {
+                return pair[2].apply(this, arguments);
+            }
+        }
+        throw MochiKit.Base.NotFound;
+    },
+
+    /** @id MochiKit.Base.AdapterRegistry.prototype.unregister */
+    unregister: function (name) {
+        for (var i = 0; i < this.pairs.length; i++) {
+            var pair = this.pairs[i];
+            if (pair[0] == name) {
+                this.pairs.splice(i, 1);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+
+MochiKit.Base.EXPORT = [
+    "flattenArray",
+    "noop",
+    "camelize",
+    "counter",
+    "clone",
+    "extend",
+    "update",
+    "updatetree",
+    "setdefault",
+    "keys",
+    "values",
+    "items",
+    "NamedError",
+    "operator",
+    "forwardCall",
+    "itemgetter",
+    "typeMatcher",
+    "isCallable",
+    "isUndefined",
+    "isUndefinedOrNull",
+    "isNull",
+    "isEmpty",
+    "isNotEmpty",
+    "isArrayLike",
+    "isDateLike",
+    "xmap",
+    "map",
+    "xfilter",
+    "filter",
+    "methodcaller",
+    "compose",
+    "bind",
+    "bindMethods",
+    "NotFound",
+    "AdapterRegistry",
+    "registerComparator",
+    "compare",
+    "registerRepr",
+    "repr",
+    "objEqual",
+    "arrayEqual",
+    "concat",
+    "keyComparator",
+    "reverseKeyComparator",
+    "partial",
+    "merge",
+    "listMinMax",
+    "listMax",
+    "listMin",
+    "objMax",
+    "objMin",
+    "nodeWalk",
+    "zip",
+    "urlEncode",
+    "queryString",
+    "serializeJSON",
+    "registerJSON",
+    "evalJSON",
+    "parseQueryString",
+    "findValue",
+    "findIdentical",
+    "flattenArguments",
+    "method",
+    "average",
+    "mean",
+    "median"
+];
+
+MochiKit.Base.EXPORT_OK = [
+    "nameFunctions",
+    "comparatorRegistry",
+    "reprRegistry",
+    "jsonRegistry",
+    "compareDateLike",
+    "compareArrayLike",
+    "reprArrayLike",
+    "reprString",
+    "reprNumber"
+];
+
+MochiKit.Base._exportSymbols = function (globals, module) {
+    if (!MochiKit.__export__) {
+        return;
+    }
+    var all = module.EXPORT_TAGS[":all"];
+    for (var i = 0; i < all.length; i++) {
+        globals[all[i]] = module[all[i]];
+    }
+};
+
+MochiKit.Base.__new__ = function () {
+    // A singleton raised when no suitable adapter is found
+    var m = this;
+
+    // convenience
+    /** @id MochiKit.Base.noop */
+    m.noop = m.operator.identity;
+
+    // Backwards compat
+    m.forward = m.forwardCall;
+    m.find = m.findValue;
+
+    if (typeof(encodeURIComponent) != "undefined") {
+        /** @id MochiKit.Base.urlEncode */
+        m.urlEncode = function (unencoded) {
+            return encodeURIComponent(unencoded).replace(/\'/g, '%27');
+        };
+    } else {
+        m.urlEncode = function (unencoded) {
+            return escape(unencoded
+                ).replace(/\+/g, '%2B'
+                ).replace(/\"/g,'%22'
+                ).rval.replace(/\'/g, '%27');
+        };
+    }
+
+    /** @id MochiKit.Base.NamedError */
+    m.NamedError = function (name) {
+        this.message = name;
+        this.name = name;
+    };
+    m.NamedError.prototype = new Error();
+    m.update(m.NamedError.prototype, {
+        repr: function () {
+            if (this.message && this.message != this.name) {
+                return this.name + "(" + m.repr(this.message) + ")";
+            } else {
+                return this.name + "()";
+            }
+        },
+        toString: m.forwardCall("repr")
+    });
+
+    /** @id MochiKit.Base.NotFound */
+    m.NotFound = new m.NamedError("MochiKit.Base.NotFound");
+
+
+    /** @id MochiKit.Base.listMax */
+    m.listMax = m.partial(m.listMinMax, 1);
+    /** @id MochiKit.Base.listMin */
+    m.listMin = m.partial(m.listMinMax, -1);
+
+    /** @id MochiKit.Base.isCallable */
+    m.isCallable = m.typeMatcher('function');
+    /** @id MochiKit.Base.isUndefined */
+    m.isUndefined = m.typeMatcher('undefined');
+
+    /** @id MochiKit.Base.merge */
+    m.merge = m.partial(m.update, null);
+    /** @id MochiKit.Base.zip */
+    m.zip = m.partial(m.map, null);
+
+    /** @id MochiKit.Base.average */
+    m.average = m.mean;
+
+    /** @id MochiKit.Base.comparatorRegistry */
+    m.comparatorRegistry = new m.AdapterRegistry();
+    m.registerComparator("dateLike", m.isDateLike, m.compareDateLike);
+    m.registerComparator("arrayLike", m.isArrayLike, m.compareArrayLike);
+
+    /** @id MochiKit.Base.reprRegistry */
+    m.reprRegistry = new m.AdapterRegistry();
+    m.registerRepr("arrayLike", m.isArrayLike, m.reprArrayLike);
+    m.registerRepr("string", m.typeMatcher("string"), m.reprString);
+    m.registerRepr("numbers", m.typeMatcher("number", "boolean"), m.reprNumber);
+
+    /** @id MochiKit.Base.jsonRegistry */
+    m.jsonRegistry = new m.AdapterRegistry();
+
+    var all = m.concat(m.EXPORT, m.EXPORT_OK);
+    m.EXPORT_TAGS = {
+        ":common": m.concat(m.EXPORT_OK),
+        ":all": all
+    };
+
+    m.nameFunctions(this);
+
+};
+
+MochiKit.Base.__new__();
+
+//
+// XXX: Internet Explorer blows
+//
+if (MochiKit.__export__) {
+    compare = MochiKit.Base.compare;
+    compose = MochiKit.Base.compose;
+    serializeJSON = MochiKit.Base.serializeJSON;
+    mean = MochiKit.Base.mean;
+    median = MochiKit.Base.median;
+}
+
+MochiKit.Base._exportSymbols(this, MochiKit.Base);
diff --git a/IPython/external/external/MochiKit/Color.js b/IPython/external/external/MochiKit/Color.js
new file mode 100644
index 0000000..708f490
--- /dev/null
+++ b/IPython/external/external/MochiKit/Color.js
@@ -0,0 +1,902 @@
+/***
+
+MochiKit.Color 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito and others.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Color');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Style');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+    JSAN.use("MochiKit.DOM", []);
+    JSAN.use("MochiKit.Style", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Color depends on MochiKit.Base";
+}
+
+try {
+    if (typeof(MochiKit.DOM) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Color depends on MochiKit.DOM";
+}
+
+try {
+    if (typeof(MochiKit.Style) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Color depends on MochiKit.Style";
+}
+
+if (typeof(MochiKit.Color) == "undefined") {
+    MochiKit.Color = {};
+}
+
+MochiKit.Color.NAME = "MochiKit.Color";
+MochiKit.Color.VERSION = "1.4";
+
+MochiKit.Color.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.Color.toString = function () {
+    return this.__repr__();
+};
+
+
+/** @id MochiKit.Color.Color */
+MochiKit.Color.Color = function (red, green, blue, alpha) {
+    if (typeof(alpha) == 'undefined' || alpha === null) {
+        alpha = 1.0;
+    }
+    this.rgb = {
+        r: red,
+        g: green,
+        b: blue,
+        a: alpha
+    };
+};
+
+
+// Prototype methods
+
+MochiKit.Color.Color.prototype = {
+
+    __class__: MochiKit.Color.Color,
+
+    /** @id MochiKit.Color.Color.prototype.colorWithAlpha */
+    colorWithAlpha: function (alpha) {
+        var rgb = this.rgb;
+        var m = MochiKit.Color;
+        return m.Color.fromRGB(rgb.r, rgb.g, rgb.b, alpha);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.colorWithHue */
+    colorWithHue: function (hue) {
+        // get an HSL model, and set the new hue...
+        var hsl = this.asHSL();
+        hsl.h = hue;
+        var m = MochiKit.Color;
+        // convert back to RGB...
+        return m.Color.fromHSL(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.colorWithSaturation */
+    colorWithSaturation: function (saturation) {
+        // get an HSL model, and set the new hue...
+        var hsl = this.asHSL();
+        hsl.s = saturation;
+        var m = MochiKit.Color;
+        // convert back to RGB...
+        return m.Color.fromHSL(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.colorWithLightness */
+    colorWithLightness: function (lightness) {
+        // get an HSL model, and set the new hue...
+        var hsl = this.asHSL();
+        hsl.l = lightness;
+        var m = MochiKit.Color;
+        // convert back to RGB...
+        return m.Color.fromHSL(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.darkerColorWithLevel */
+    darkerColorWithLevel: function (level) {
+        var hsl  = this.asHSL();
+        hsl.l = Math.max(hsl.l - level, 0);
+        var m = MochiKit.Color;
+        return m.Color.fromHSL(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.lighterColorWithLevel */
+    lighterColorWithLevel: function (level) {
+        var hsl  = this.asHSL();
+        hsl.l = Math.min(hsl.l + level, 1);
+        var m = MochiKit.Color;
+        return m.Color.fromHSL(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.blendedColor */
+    blendedColor: function (other, /* optional */ fraction) {
+        if (typeof(fraction) == 'undefined' || fraction === null) {
+            fraction = 0.5;
+        }
+        var sf = 1.0 - fraction;
+        var s = this.rgb;
+        var d = other.rgb;
+        var df = fraction;
+        return MochiKit.Color.Color.fromRGB(
+            (s.r * sf) + (d.r * df),
+            (s.g * sf) + (d.g * df),
+            (s.b * sf) + (d.b * df),
+            (s.a * sf) + (d.a * df)
+        );
+    },
+
+    /** @id MochiKit.Color.Color.prototype.compareRGB */
+    compareRGB: function (other) {
+        var a = this.asRGB();
+        var b = other.asRGB();
+        return MochiKit.Base.compare(
+            [a.r, a.g, a.b, a.a],
+            [b.r, b.g, b.b, b.a]
+        );
+    },
+
+    /** @id MochiKit.Color.Color.prototype.isLight */
+    isLight: function () {
+        return this.asHSL().b > 0.5;
+    },
+
+    /** @id MochiKit.Color.Color.prototype.isDark */
+    isDark: function () {
+        return (!this.isLight());
+    },
+
+    /** @id MochiKit.Color.Color.prototype.toHSLString */
+    toHSLString: function () {
+        var c = this.asHSL();
+        var ccc = MochiKit.Color.clampColorComponent;
+        var rval = this._hslString;
+        if (!rval) {
+            var mid = (
+                ccc(c.h, 360).toFixed(0)
+                + "," + ccc(c.s, 100).toPrecision(4) + "%"
+                + "," + ccc(c.l, 100).toPrecision(4) + "%"
+            );
+            var a = c.a;
+            if (a >= 1) {
+                a = 1;
+                rval = "hsl(" + mid + ")";
+            } else {
+                if (a <= 0) {
+                    a = 0;
+                }
+                rval = "hsla(" + mid + "," + a + ")";
+            }
+            this._hslString = rval;
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Color.Color.prototype.toRGBString */
+    toRGBString: function () {
+        var c = this.rgb;
+        var ccc = MochiKit.Color.clampColorComponent;
+        var rval = this._rgbString;
+        if (!rval) {
+            var mid = (
+                ccc(c.r, 255).toFixed(0)
+                + "," + ccc(c.g, 255).toFixed(0)
+                + "," + ccc(c.b, 255).toFixed(0)
+            );
+            if (c.a != 1) {
+                rval = "rgba(" + mid + "," + c.a + ")";
+            } else {
+                rval = "rgb(" + mid + ")";
+            }
+            this._rgbString = rval;
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Color.Color.prototype.asRGB */
+    asRGB: function () {
+        return MochiKit.Base.clone(this.rgb);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.toHexString */
+    toHexString: function () {
+        var m = MochiKit.Color;
+        var c = this.rgb;
+        var ccc = MochiKit.Color.clampColorComponent;
+        var rval = this._hexString;
+        if (!rval) {
+            rval = ("#" +
+                m.toColorPart(ccc(c.r, 255)) +
+                m.toColorPart(ccc(c.g, 255)) +
+                m.toColorPart(ccc(c.b, 255))
+            );
+            this._hexString = rval;
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Color.Color.prototype.asHSV */
+    asHSV: function () {
+        var hsv = this.hsv;
+        var c = this.rgb;
+        if (typeof(hsv) == 'undefined' || hsv === null) {
+            hsv = MochiKit.Color.rgbToHSV(this.rgb);
+            this.hsv = hsv;
+        }
+        return MochiKit.Base.clone(hsv);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.asHSL */
+    asHSL: function () {
+        var hsl = this.hsl;
+        var c = this.rgb;
+        if (typeof(hsl) == 'undefined' || hsl === null) {
+            hsl = MochiKit.Color.rgbToHSL(this.rgb);
+            this.hsl = hsl;
+        }
+        return MochiKit.Base.clone(hsl);
+    },
+
+    /** @id MochiKit.Color.Color.prototype.toString */
+    toString: function () {
+        return this.toRGBString();
+    },
+
+    /** @id MochiKit.Color.Color.prototype.repr */
+    repr: function () {
+        var c = this.rgb;
+        var col = [c.r, c.g, c.b, c.a];
+        return this.__class__.NAME + "(" + col.join(", ") + ")";
+    }
+
+};
+
+// Constructor methods
+
+MochiKit.Base.update(MochiKit.Color.Color, {
+    /** @id MochiKit.Color.Color.fromRGB */
+    fromRGB: function (red, green, blue, alpha) {
+        // designated initializer
+        var Color = MochiKit.Color.Color;
+        if (arguments.length == 1) {
+            var rgb = red;
+            red = rgb.r;
+            green = rgb.g;
+            blue = rgb.b;
+            if (typeof(rgb.a) == 'undefined') {
+                alpha = undefined;
+            } else {
+                alpha = rgb.a;
+            }
+        }
+        return new Color(red, green, blue, alpha);
+    },
+
+    /** @id MochiKit.Color.Color.fromHSL */
+    fromHSL: function (hue, saturation, lightness, alpha) {
+        var m = MochiKit.Color;
+        return m.Color.fromRGB(m.hslToRGB.apply(m, arguments));
+    },
+
+    /** @id MochiKit.Color.Color.fromHSV */
+    fromHSV: function (hue, saturation, value, alpha) {
+        var m = MochiKit.Color;
+        return m.Color.fromRGB(m.hsvToRGB.apply(m, arguments));
+    },
+
+    /** @id MochiKit.Color.Color.fromName */
+    fromName: function (name) {
+        var Color = MochiKit.Color.Color;
+        // Opera 9 seems to "quote" named colors(?!)
+        if (name.charAt(0) == '"') {
+            name = name.substr(1, name.length - 2);
+        }
+        var htmlColor = Color._namedColors[name.toLowerCase()];
+        if (typeof(htmlColor) == 'string') {
+            return Color.fromHexString(htmlColor);
+        } else if (name == "transparent") {
+            return Color.transparentColor();
+        }
+        return null;
+    },
+
+    /** @id MochiKit.Color.Color.fromString */
+    fromString: function (colorString) {
+        var self = MochiKit.Color.Color;
+        var three = colorString.substr(0, 3);
+        if (three == "rgb") {
+            return self.fromRGBString(colorString);
+        } else if (three == "hsl") {
+            return self.fromHSLString(colorString);
+        } else if (colorString.charAt(0) == "#") {
+            return self.fromHexString(colorString);
+        }
+        return self.fromName(colorString);
+    },
+
+
+    /** @id MochiKit.Color.Color.fromHexString */
+    fromHexString: function (hexCode) {
+        if (hexCode.charAt(0) == '#') {
+            hexCode = hexCode.substring(1);
+        }
+        var components = [];
+        var i, hex;
+        if (hexCode.length == 3) {
+            for (i = 0; i < 3; i++) {
+                hex = hexCode.substr(i, 1);
+                components.push(parseInt(hex + hex, 16) / 255.0);
+            }
+        } else {
+            for (i = 0; i < 6; i += 2) {
+                hex = hexCode.substr(i, 2);
+                components.push(parseInt(hex, 16) / 255.0);
+            }
+        }
+        var Color = MochiKit.Color.Color;
+        return Color.fromRGB.apply(Color, components);
+    },
+
+
+    _fromColorString: function (pre, method, scales, colorCode) {
+        // parses either HSL or RGB
+        if (colorCode.indexOf(pre) === 0) {
+            colorCode = colorCode.substring(colorCode.indexOf("(", 3) + 1, colorCode.length - 1);
+        }
+        var colorChunks = colorCode.split(/\s*,\s*/);
+        var colorFloats = [];
+        for (var i = 0; i < colorChunks.length; i++) {
+            var c = colorChunks[i];
+            var val;
+            var three = c.substring(c.length - 3);
+            if (c.charAt(c.length - 1) == '%') {
+                val = 0.01 * parseFloat(c.substring(0, c.length - 1));
+            } else if (three == "deg") {
+                val = parseFloat(c) / 360.0;
+            } else if (three == "rad") {
+                val = parseFloat(c) / (Math.PI * 2);
+            } else {
+                val = scales[i] * parseFloat(c);
+            }
+            colorFloats.push(val);
+        }
+        return this[method].apply(this, colorFloats);
+    },
+
+    /** @id MochiKit.Color.Color.fromComputedStyle */
+    fromComputedStyle: function (elem, style) {
+        var d = MochiKit.DOM;
+        var cls = MochiKit.Color.Color;
+        for (elem = d.getElement(elem); elem; elem = elem.parentNode) {
+            var actualColor = MochiKit.Style.getStyle.apply(d, arguments);
+            if (!actualColor) {
+                continue;
+            }
+            var color = cls.fromString(actualColor);
+            if (!color) {
+                break;
+            }
+            if (color.asRGB().a > 0) {
+                return color;
+            }
+        }
+        return null;
+    },
+
+    /** @id MochiKit.Color.Color.fromBackground */
+    fromBackground: function (elem) {
+        var cls = MochiKit.Color.Color;
+        return cls.fromComputedStyle(
+            elem, "backgroundColor", "background-color") || cls.whiteColor();
+    },
+
+    /** @id MochiKit.Color.Color.fromText */
+    fromText: function (elem) {
+        var cls = MochiKit.Color.Color;
+        return cls.fromComputedStyle(
+            elem, "color", "color") || cls.blackColor();
+    },
+
+    /** @id MochiKit.Color.Color.namedColors */
+    namedColors: function () {
+        return MochiKit.Base.clone(MochiKit.Color.Color._namedColors);
+    }
+});
+
+
+// Module level functions
+
+MochiKit.Base.update(MochiKit.Color, {
+    /** @id MochiKit.Color.clampColorComponent */
+    clampColorComponent: function (v, scale) {
+        v *= scale;
+        if (v < 0) {
+            return 0;
+        } else if (v > scale) {
+            return scale;
+        } else {
+            return v;
+        }
+    },
+
+    _hslValue: function (n1, n2, hue) {
+        if (hue > 6.0) {
+            hue -= 6.0;
+        } else if (hue < 0.0) {
+            hue += 6.0;
+        }
+        var val;
+        if (hue < 1.0) {
+            val = n1 + (n2 - n1) * hue;
+        } else if (hue < 3.0) {
+            val = n2;
+        } else if (hue < 4.0) {
+            val = n1 + (n2 - n1) * (4.0 - hue);
+        } else {
+            val = n1;
+        }
+        return val;
+    },
+
+    /** @id MochiKit.Color.hsvToRGB */
+    hsvToRGB: function (hue, saturation, value, alpha) {
+        if (arguments.length == 1) {
+            var hsv = hue;
+            hue = hsv.h;
+            saturation = hsv.s;
+            value = hsv.v;
+            alpha = hsv.a;
+        }
+        var red;
+        var green;
+        var blue;
+        if (saturation === 0) {
+            red = value;
+            green = value;
+            blue = value;
+        } else {
+            var i = Math.floor(hue * 6);
+            var f = (hue * 6) - i;
+            var p = value * (1 - saturation);
+            var q = value * (1 - (saturation * f));
+            var t = value * (1 - (saturation * (1 - f)));
+            switch (i) {
+                case 1: red = q; green = value; blue = p; break;
+                case 2: red = p; green = value; blue = t; break;
+                case 3: red = p; green = q; blue = value; break;
+                case 4: red = t; green = p; blue = value; break;
+                case 5: red = value; green = p; blue = q; break;
+                case 6: // fall through
+                case 0: red = value; green = t; blue = p; break;
+            }
+        }
+        return {
+            r: red,
+            g: green,
+            b: blue,
+            a: alpha
+        };
+    },
+
+    /** @id MochiKit.Color.hslToRGB */
+    hslToRGB: function (hue, saturation, lightness, alpha) {
+        if (arguments.length == 1) {
+            var hsl = hue;
+            hue = hsl.h;
+            saturation = hsl.s;
+            lightness = hsl.l;
+            alpha = hsl.a;
+        }
+        var red;
+        var green;
+        var blue;
+        if (saturation === 0) {
+            red = lightness;
+            green = lightness;
+            blue = lightness;
+        } else {
+            var m2;
+            if (lightness <= 0.5) {
+                m2 = lightness * (1.0 + saturation);
+            } else {
+                m2 = lightness + saturation - (lightness * saturation);
+            }
+            var m1 = (2.0 * lightness) - m2;
+            var f = MochiKit.Color._hslValue;
+            var h6 = hue * 6.0;
+            red = f(m1, m2, h6 + 2);
+            green = f(m1, m2, h6);
+            blue = f(m1, m2, h6 - 2);
+        }
+        return {
+            r: red,
+            g: green,
+            b: blue,
+            a: alpha
+        };
+    },
+
+    /** @id MochiKit.Color.rgbToHSV */
+    rgbToHSV: function (red, green, blue, alpha) {
+        if (arguments.length == 1) {
+            var rgb = red;
+            red = rgb.r;
+            green = rgb.g;
+            blue = rgb.b;
+            alpha = rgb.a;
+        }
+        var max = Math.max(Math.max(red, green), blue);
+        var min = Math.min(Math.min(red, green), blue);
+        var hue;
+        var saturation;
+        var value = max;
+        if (min == max) {
+            hue = 0;
+            saturation = 0;
+        } else {
+            var delta = (max - min);
+            saturation = delta / max;
+
+            if (red == max) {
+                hue = (green - blue) / delta;
+            } else if (green == max) {
+                hue = 2 + ((blue - red) / delta);
+            } else {
+                hue = 4 + ((red - green) / delta);
+            }
+            hue /= 6;
+            if (hue < 0) {
+                hue += 1;
+            }
+            if (hue > 1) {
+                hue -= 1;
+            }
+        }
+        return {
+            h: hue,
+            s: saturation,
+            v: value,
+            a: alpha
+        };
+    },
+
+    /** @id MochiKit.Color.rgbToHSL */
+    rgbToHSL: function (red, green, blue, alpha) {
+        if (arguments.length == 1) {
+            var rgb = red;
+            red = rgb.r;
+            green = rgb.g;
+            blue = rgb.b;
+            alpha = rgb.a;
+        }
+        var max = Math.max(red, Math.max(green, blue));
+        var min = Math.min(red, Math.min(green, blue));
+        var hue;
+        var saturation;
+        var lightness = (max + min) / 2.0;
+        var delta = max - min;
+        if (delta === 0) {
+            hue = 0;
+            saturation = 0;
+        } else {
+            if (lightness <= 0.5) {
+                saturation = delta / (max + min);
+            } else {
+                saturation = delta / (2 - max - min);
+            }
+            if (red == max) {
+                hue = (green - blue) / delta;
+            } else if (green == max) {
+                hue = 2 + ((blue - red) / delta);
+            } else {
+                hue = 4 + ((red - green) / delta);
+            }
+            hue /= 6;
+            if (hue < 0) {
+                hue += 1;
+            }
+            if (hue > 1) {
+                hue -= 1;
+            }
+
+        }
+        return {
+            h: hue,
+            s: saturation,
+            l: lightness,
+            a: alpha
+        };
+    },
+
+    /** @id MochiKit.Color.toColorPart */
+    toColorPart: function (num) {
+        num = Math.round(num);
+        var digits = num.toString(16);
+        if (num < 16) {
+            return '0' + digits;
+        }
+        return digits;
+    },
+
+    __new__: function () {
+        var m = MochiKit.Base;
+        /** @id MochiKit.Color.fromRGBString */
+        this.Color.fromRGBString = m.bind(
+            this.Color._fromColorString, this.Color, "rgb", "fromRGB",
+            [1.0/255.0, 1.0/255.0, 1.0/255.0, 1]
+        );
+        /** @id MochiKit.Color.fromHSLString */
+        this.Color.fromHSLString = m.bind(
+            this.Color._fromColorString, this.Color, "hsl", "fromHSL",
+            [1.0/360.0, 0.01, 0.01, 1]
+        );
+
+        var third = 1.0 / 3.0;
+        /** @id MochiKit.Color.colors */
+        var colors = {
+            // NSColor colors plus transparent
+            /** @id MochiKit.Color.blackColor */
+            black: [0, 0, 0],
+            /** @id MochiKit.Color.blueColor */
+            blue: [0, 0, 1],
+            /** @id MochiKit.Color.brownColor */
+            brown: [0.6, 0.4, 0.2],
+            /** @id MochiKit.Color.cyanColor */
+            cyan: [0, 1, 1],
+            /** @id MochiKit.Color.darkGrayColor */
+            darkGray: [third, third, third],
+            /** @id MochiKit.Color.grayColor */
+            gray: [0.5, 0.5, 0.5],
+            /** @id MochiKit.Color.greenColor */
+            green: [0, 1, 0],
+            /** @id MochiKit.Color.lightGrayColor */
+            lightGray: [2 * third, 2 * third, 2 * third],
+            /** @id MochiKit.Color.magentaColor */
+            magenta: [1, 0, 1],
+            /** @id MochiKit.Color.orangeColor */
+            orange: [1, 0.5, 0],
+            /** @id MochiKit.Color.purpleColor */
+            purple: [0.5, 0, 0.5],
+            /** @id MochiKit.Color.redColor */
+            red: [1, 0, 0],
+            /** @id MochiKit.Color.transparentColor */
+            transparent: [0, 0, 0, 0],
+            /** @id MochiKit.Color.whiteColor */
+            white: [1, 1, 1],
+            /** @id MochiKit.Color.yellowColor */
+            yellow: [1, 1, 0]
+        };
+
+        var makeColor = function (name, r, g, b, a) {
+            var rval = this.fromRGB(r, g, b, a);
+            this[name] = function () { return rval; };
+            return rval;
+        };
+
+        for (var k in colors) {
+            var name = k + "Color";
+            var bindArgs = m.concat(
+                [makeColor, this.Color, name],
+                colors[k]
+            );
+            this.Color[name] = m.bind.apply(null, bindArgs);
+        }
+
+        var isColor = function () {
+            for (var i = 0; i < arguments.length; i++) {
+                if (!(arguments[i] instanceof Color)) {
+                    return false;
+                }
+            }
+            return true;
+        };
+
+        var compareColor = function (a, b) {
+            return a.compareRGB(b);
+        };
+
+        m.nameFunctions(this);
+
+        m.registerComparator(this.Color.NAME, isColor, compareColor);
+
+        this.EXPORT_TAGS = {
+            ":common": this.EXPORT,
+            ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+        };
+
+    }
+});
+
+MochiKit.Color.EXPORT = [
+    "Color"
+];
+
+MochiKit.Color.EXPORT_OK = [
+    "clampColorComponent",
+    "rgbToHSL",
+    "hslToRGB",
+    "rgbToHSV",
+    "hsvToRGB",
+    "toColorPart"
+];
+
+MochiKit.Color.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Color);
+
+// Full table of css3 X11 colors <http://www.w3.org/TR/css3-color/#X11COLORS>
+
+MochiKit.Color.Color._namedColors = {
+    aliceblue: "#f0f8ff",
+    antiquewhite: "#faebd7",
+    aqua: "#00ffff",
+    aquamarine: "#7fffd4",
+    azure: "#f0ffff",
+    beige: "#f5f5dc",
+    bisque: "#ffe4c4",
+    black: "#000000",
+    blanchedalmond: "#ffebcd",
+    blue: "#0000ff",
+    blueviolet: "#8a2be2",
+    brown: "#a52a2a",
+    burlywood: "#deb887",
+    cadetblue: "#5f9ea0",
+    chartreuse: "#7fff00",
+    chocolate: "#d2691e",
+    coral: "#ff7f50",
+    cornflowerblue: "#6495ed",
+    cornsilk: "#fff8dc",
+    crimson: "#dc143c",
+    cyan: "#00ffff",
+    darkblue: "#00008b",
+    darkcyan: "#008b8b",
+    darkgoldenrod: "#b8860b",
+    darkgray: "#a9a9a9",
+    darkgreen: "#006400",
+    darkgrey: "#a9a9a9",
+    darkkhaki: "#bdb76b",
+    darkmagenta: "#8b008b",
+    darkolivegreen: "#556b2f",
+    darkorange: "#ff8c00",
+    darkorchid: "#9932cc",
+    darkred: "#8b0000",
+    darksalmon: "#e9967a",
+    darkseagreen: "#8fbc8f",
+    darkslateblue: "#483d8b",
+    darkslategray: "#2f4f4f",
+    darkslategrey: "#2f4f4f",
+    darkturquoise: "#00ced1",
+    darkviolet: "#9400d3",
+    deeppink: "#ff1493",
+    deepskyblue: "#00bfff",
+    dimgray: "#696969",
+    dimgrey: "#696969",
+    dodgerblue: "#1e90ff",
+    firebrick: "#b22222",
+    floralwhite: "#fffaf0",
+    forestgreen: "#228b22",
+    fuchsia: "#ff00ff",
+    gainsboro: "#dcdcdc",
+    ghostwhite: "#f8f8ff",
+    gold: "#ffd700",
+    goldenrod: "#daa520",
+    gray: "#808080",
+    green: "#008000",
+    greenyellow: "#adff2f",
+    grey: "#808080",
+    honeydew: "#f0fff0",
+    hotpink: "#ff69b4",
+    indianred: "#cd5c5c",
+    indigo: "#4b0082",
+    ivory: "#fffff0",
+    khaki: "#f0e68c",
+    lavender: "#e6e6fa",
+    lavenderblush: "#fff0f5",
+    lawngreen: "#7cfc00",
+    lemonchiffon: "#fffacd",
+    lightblue: "#add8e6",
+    lightcoral: "#f08080",
+    lightcyan: "#e0ffff",
+    lightgoldenrodyellow: "#fafad2",
+    lightgray: "#d3d3d3",
+    lightgreen: "#90ee90",
+    lightgrey: "#d3d3d3",
+    lightpink: "#ffb6c1",
+    lightsalmon: "#ffa07a",
+    lightseagreen: "#20b2aa",
+    lightskyblue: "#87cefa",
+    lightslategray: "#778899",
+    lightslategrey: "#778899",
+    lightsteelblue: "#b0c4de",
+    lightyellow: "#ffffe0",
+    lime: "#00ff00",
+    limegreen: "#32cd32",
+    linen: "#faf0e6",
+    magenta: "#ff00ff",
+    maroon: "#800000",
+    mediumaquamarine: "#66cdaa",
+    mediumblue: "#0000cd",
+    mediumorchid: "#ba55d3",
+    mediumpurple: "#9370db",
+    mediumseagreen: "#3cb371",
+    mediumslateblue: "#7b68ee",
+    mediumspringgreen: "#00fa9a",
+    mediumturquoise: "#48d1cc",
+    mediumvioletred: "#c71585",
+    midnightblue: "#191970",
+    mintcream: "#f5fffa",
+    mistyrose: "#ffe4e1",
+    moccasin: "#ffe4b5",
+    navajowhite: "#ffdead",
+    navy: "#000080",
+    oldlace: "#fdf5e6",
+    olive: "#808000",
+    olivedrab: "#6b8e23",
+    orange: "#ffa500",
+    orangered: "#ff4500",
+    orchid: "#da70d6",
+    palegoldenrod: "#eee8aa",
+    palegreen: "#98fb98",
+    paleturquoise: "#afeeee",
+    palevioletred: "#db7093",
+    papayawhip: "#ffefd5",
+    peachpuff: "#ffdab9",
+    peru: "#cd853f",
+    pink: "#ffc0cb",
+    plum: "#dda0dd",
+    powderblue: "#b0e0e6",
+    purple: "#800080",
+    red: "#ff0000",
+    rosybrown: "#bc8f8f",
+    royalblue: "#4169e1",
+    saddlebrown: "#8b4513",
+    salmon: "#fa8072",
+    sandybrown: "#f4a460",
+    seagreen: "#2e8b57",
+    seashell: "#fff5ee",
+    sienna: "#a0522d",
+    silver: "#c0c0c0",
+    skyblue: "#87ceeb",
+    slateblue: "#6a5acd",
+    slategray: "#708090",
+    slategrey: "#708090",
+    snow: "#fffafa",
+    springgreen: "#00ff7f",
+    steelblue: "#4682b4",
+    tan: "#d2b48c",
+    teal: "#008080",
+    thistle: "#d8bfd8",
+    tomato: "#ff6347",
+    turquoise: "#40e0d0",
+    violet: "#ee82ee",
+    wheat: "#f5deb3",
+    white: "#ffffff",
+    whitesmoke: "#f5f5f5",
+    yellow: "#ffff00",
+    yellowgreen: "#9acd32"
+};
diff --git a/IPython/external/external/MochiKit/DOM.js b/IPython/external/external/MochiKit/DOM.js
new file mode 100644
index 0000000..206bd9a
--- /dev/null
+++ b/IPython/external/external/MochiKit/DOM.js
@@ -0,0 +1,1281 @@
+/***
+
+MochiKit.DOM 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide("MochiKit.DOM");
+    dojo.require("MochiKit.Base");
+}
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.DOM depends on MochiKit.Base!";
+}
+
+if (typeof(MochiKit.DOM) == 'undefined') {
+    MochiKit.DOM = {};
+}
+
+MochiKit.DOM.NAME = "MochiKit.DOM";
+MochiKit.DOM.VERSION = "1.4";
+MochiKit.DOM.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+MochiKit.DOM.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.DOM.EXPORT = [
+    "removeEmptyTextNodes",
+    "formContents",
+    "currentWindow",
+    "currentDocument",
+    "withWindow",
+    "withDocument",
+    "registerDOMConverter",
+    "coerceToDOM",
+    "createDOM",
+    "createDOMFunc",
+    "isChildNode",
+    "getNodeAttribute",
+    "removeNodeAttribute",
+    "setNodeAttribute",
+    "updateNodeAttributes",
+    "appendChildNodes",
+    "insertSiblingNodesAfter",
+    "insertSiblingNodesBefore",
+    "replaceChildNodes",
+    "removeElement",
+    "swapDOM",
+    "BUTTON",
+    "TT",
+    "PRE",
+    "H1",
+    "H2",
+    "H3",
+    "BR",
+    "CANVAS",
+    "HR",
+    "LABEL",
+    "TEXTAREA",
+    "FORM",
+    "STRONG",
+    "SELECT",
+    "OPTION",
+    "OPTGROUP",
+    "LEGEND",
+    "FIELDSET",
+    "P",
+    "UL",
+    "OL",
+    "LI",
+    "TD",
+    "TR",
+    "THEAD",
+    "TBODY",
+    "TFOOT",
+    "TABLE",
+    "TH",
+    "INPUT",
+    "SPAN",
+    "A",
+    "DIV",
+    "IMG",
+    "getElement",
+    "$",
+    "getElementsByTagAndClassName",
+    "addToCallStack",
+    "addLoadEvent",
+    "focusOnLoad",
+    "setElementClass",
+    "toggleElementClass",
+    "addElementClass",
+    "removeElementClass",
+    "swapElementClass",
+    "hasElementClass",
+    "escapeHTML",
+    "toHTML",
+    "emitHTML",
+    "scrapeText",
+    "isParent",
+    "getFirstParentByTagAndClassName",
+    "makeClipping",
+    "undoClipping",
+    "makePositioned",
+    "undoPositioned",
+    "getFirstElementByTagAndClassName"
+];
+
+MochiKit.DOM.EXPORT_OK = [
+    "domConverters"
+];
+
+MochiKit.DOM.DEPRECATED = [
+    ['computedStyle', 'MochiKit.Style.getStyle', '1.4'],
+    /** @id MochiKit.DOM.elementDimensions  */
+    ['elementDimensions', 'MochiKit.Style.getElementDimensions', '1.4'],
+    /** @id MochiKit.DOM.elementPosition  */
+    ['elementPosition', 'MochiKit.Style.getElementPosition', '1.4'],
+    ['hideElement', 'MochiKit.Style.hideElement', '1.4'],
+    /** @id MochiKit.DOM.setElementDimensions */
+    ['setElementDimensions', 'MochiKit.Style.setElementDimensions', '1.4'],
+    /** @id MochiKit.DOM.setElementPosition */
+    ['setElementPosition', 'MochiKit.Style.setElementPosition', '1.4'],
+    ['setDisplayForElement', 'MochiKit.Style.setDisplayForElement', '1.4'],
+    /** @id MochiKit.DOM.setOpacity */
+    ['setOpacity', 'MochiKit.Style.setOpacity', '1.4'],
+    ['showElement', 'MochiKit.Style.showElement', '1.4'],
+    /** @id MochiKit.DOM.Coordinates */
+    ['Coordinates', 'MochiKit.Style.Coordinates', '1.4'], // FIXME: broken
+    /** @id MochiKit.DOM.Dimensions */
+    ['Dimensions', 'MochiKit.Style.Dimensions', '1.4'] // FIXME: broken
+];
+
+/** @id MochiKit.DOM.getViewportDimensions */
+MochiKit.DOM.getViewportDimensions = new Function('' +
+    'if (!MochiKit["Style"]) {' +
+    '    throw new Error("This function has been deprecated and depends on MochiKit.Style.");' +
+    '}' +
+    'return MochiKit.Style.getViewportDimensions.apply(this, arguments);');
+
+MochiKit.Base.update(MochiKit.DOM, {
+
+    /** @id MochiKit.DOM.currentWindow */
+    currentWindow: function () {
+        return MochiKit.DOM._window;
+    },
+
+    /** @id MochiKit.DOM.currentDocument */
+    currentDocument: function () {
+        return MochiKit.DOM._document;
+    },
+
+    /** @id MochiKit.DOM.withWindow */
+    withWindow: function (win, func) {
+        var self = MochiKit.DOM;
+        var oldDoc = self._document;
+        var oldWin = self._window;
+        var rval;
+        try {
+            self._window = win;
+            self._document = win.document;
+            rval = func();
+        } catch (e) {
+            self._window = oldWin;
+            self._document = oldDoc;
+            throw e;
+        }
+        self._window = oldWin;
+        self._document = oldDoc;
+        return rval;
+    },
+
+    /** @id MochiKit.DOM.formContents  */
+    formContents: function (elem/* = document.body */) {
+        var names = [];
+        var values = [];
+        var m = MochiKit.Base;
+        var self = MochiKit.DOM;
+        if (typeof(elem) == "undefined" || elem === null) {
+            elem = self._document.body;
+        } else {
+            elem = self.getElement(elem);
+        }
+        m.nodeWalk(elem, function (elem) {
+            var name = elem.name;
+            if (m.isNotEmpty(name)) {
+                var tagName = elem.tagName.toUpperCase();
+                if (tagName === "INPUT"
+                    && (elem.type == "radio" || elem.type == "checkbox")
+                    && !elem.checked
+                ) {
+                    return null;
+                }
+                if (tagName === "SELECT") {
+                    if (elem.type == "select-one") {
+                        if (elem.selectedIndex >= 0) {
+                            var opt = elem.options[elem.selectedIndex];
+                            var v = opt.value;
+                            if (!v) {
+                                var h = opt.outerHTML;
+                                // internet explorer sure does suck.
+                                if (h && !h.match(/^[^>]+\svalue\s*=/i)) {
+                                    v = opt.text;
+                                }
+                            }
+                            names.push(name);
+                            values.push(v);
+                            return null;
+                        }
+                        // no form elements?
+                        names.push(name);
+                        values.push("");
+                        return null;
+                    } else {
+                        var opts = elem.options;
+                        if (!opts.length) {
+                            names.push(name);
+                            values.push("");
+                            return null;
+                        }
+                        for (var i = 0; i < opts.length; i++) {
+                            var opt = opts[i];
+                            if (!opt.selected) {
+                                continue;
+                            }
+                            var v = opt.value;
+                            if (!v) {
+                                var h = opt.outerHTML;
+                                // internet explorer sure does suck.
+                                if (h && !h.match(/^[^>]+\svalue\s*=/i)) {
+                                    v = opt.text;
+                                }
+                            }
+                            names.push(name);
+                            values.push(v);
+                        }
+                        return null;
+                    }
+                }
+                if (tagName === "FORM" || tagName === "P" || tagName === "SPAN"
+                    || tagName === "DIV"
+                ) {
+                    return elem.childNodes;
+                }
+                names.push(name);
+                values.push(elem.value || '');
+                return null;
+            }
+            return elem.childNodes;
+        });
+        return [names, values];
+    },
+
+    /** @id MochiKit.DOM.withDocument */
+    withDocument: function (doc, func) {
+        var self = MochiKit.DOM;
+        var oldDoc = self._document;
+        var rval;
+        try {
+            self._document = doc;
+            rval = func();
+        } catch (e) {
+            self._document = oldDoc;
+            throw e;
+        }
+        self._document = oldDoc;
+        return rval;
+    },
+
+    /** @id MochiKit.DOM.registerDOMConverter */
+    registerDOMConverter: function (name, check, wrap, /* optional */override) {
+        MochiKit.DOM.domConverters.register(name, check, wrap, override);
+    },
+
+    /** @id MochiKit.DOM.coerceToDOM */
+    coerceToDOM: function (node, ctx) {
+        var m = MochiKit.Base;
+        var im = MochiKit.Iter;
+        var self = MochiKit.DOM;
+        if (im) {
+            var iter = im.iter;
+            var repeat = im.repeat;
+            var map = m.map;
+        }
+        var domConverters = self.domConverters;
+        var coerceToDOM = arguments.callee;
+        var NotFound = m.NotFound;
+        while (true) {
+            if (typeof(node) == 'undefined' || node === null) {
+                return null;
+            }
+            // this is a safari childNodes object, avoiding crashes w/ attr
+            // lookup
+            if (typeof(node) == "function" &&
+                    typeof(node.length) == "number" &&
+                    !(node instanceof Function)) {
+                node = im.list(node);
+            }
+            if (typeof(node.nodeType) != 'undefined' && node.nodeType > 0) {
+                return node;
+            }
+            if (typeof(node) == 'number' || typeof(node) == 'boolean') {
+                node = node.toString();
+                // FALL THROUGH
+            }
+            if (typeof(node) == 'string') {
+                return self._document.createTextNode(node);
+            }
+            if (typeof(node.__dom__) == 'function') {
+                node = node.__dom__(ctx);
+                continue;
+            }
+            if (typeof(node.dom) == 'function') {
+                node = node.dom(ctx);
+                continue;
+            }
+            if (typeof(node) == 'function') {
+                node = node.apply(ctx, [ctx]);
+                continue;
+            }
+
+            if (im) {
+                // iterable
+                var iterNodes = null;
+                try {
+                    iterNodes = iter(node);
+                } catch (e) {
+                    // pass
+                }
+                if (iterNodes) {
+                    return map(coerceToDOM, iterNodes, repeat(ctx));
+                }
+            }
+
+            // adapter
+            try {
+                node = domConverters.match(node, ctx);
+                continue;
+            } catch (e) {
+                if (e != NotFound) {
+                    throw e;
+                }
+            }
+
+            // fallback
+            return self._document.createTextNode(node.toString());
+        }
+        // mozilla warnings aren't too bright
+        return undefined;
+    },
+
+    /** @id MochiKit.DOM.isChildNode */
+    isChildNode: function (node, maybeparent) {
+        var self = MochiKit.DOM;
+        if (typeof(node) == "string") {
+            node = self.getElement(node);
+        }
+        if (typeof(maybeparent) == "string") {
+            maybeparent = self.getElement(maybeparent);
+        }
+        if (typeof(node) == 'undefined' || node === null || node === self._document) {
+            return false;
+        }
+        do {
+            if (node === maybeparent) {
+                return true;
+            }
+            var tagName = node.tagName;
+            node = node.parentNode;
+            if (!tagName) {
+                break;
+            }
+            tagName = tagName.toUpperCase();
+        } while (tagName != "BODY" && tagName != "HTML");
+        return false;
+    },
+
+    /** @id MochiKit.DOM.setNodeAttribute */
+    setNodeAttribute: function (node, attr, value) {
+        var o = {};
+        o[attr] = value;
+        try {
+            return MochiKit.DOM.updateNodeAttributes(node, o);
+        } catch (e) {
+            // pass
+        }
+        return null;
+    },
+
+    /** @id MochiKit.DOM.getNodeAttribute */
+    getNodeAttribute: function (node, attr) {
+        var self = MochiKit.DOM;
+        var rename = self.attributeArray.renames[attr];
+        node = self.getElement(node);
+        try {
+            if (rename) {
+                return node[rename];
+            }
+            return node.getAttribute(attr);
+        } catch (e) {
+            // pass
+        }
+        return null;
+    },
+
+    /** @id MochiKit.DOM.removeNodeAttribute */
+    removeNodeAttribute: function (node, attr) {
+        var self = MochiKit.DOM;
+        var rename = self.attributeArray.renames[attr];
+        node = self.getElement(node);
+        try {
+            if (rename) {
+                return node[rename];
+            }
+            return node.removeAttribute(attr);
+        } catch (e) {
+            // pass
+        }
+        return null;
+    },
+
+    /** @id MochiKit.DOM.updateNodeAttributes */
+    updateNodeAttributes: function (node, attrs) {
+        var elem = node;
+        var self = MochiKit.DOM;
+        if (typeof(node) == 'string') {
+            elem = self.getElement(node);
+        }
+        if (attrs) {
+            var updatetree = MochiKit.Base.updatetree;
+            if (self.attributeArray.compliant) {
+                // not IE, good.
+                for (var k in attrs) {
+                    var v = attrs[k];
+                    if (typeof(v) == 'object' && typeof(elem[k]) == 'object') {
+                        if (k == "style" && MochiKit.Style) {
+                            MochiKit.Style.setStyle(elem, v);
+                        } else {
+                            updatetree(elem[k], v);
+                        }
+                    } else if (k.substring(0, 2) == "on") {
+                        if (typeof(v) == "string") {
+                            v = new Function(v);
+                        }
+                        elem[k] = v;
+                    } else {
+                        elem.setAttribute(k, v);
+                    }
+                }
+            } else {
+                // IE is insane in the membrane
+                var renames = self.attributeArray.renames;
+                for (var k in attrs) {
+                    v = attrs[k];
+                    var renamed = renames[k];
+                    if (k == "style" && typeof(v) == "string") {
+                        elem.style.cssText = v;
+                    } else if (typeof(renamed) == "string") {
+                        elem[renamed] = v;
+                    } else if (typeof(elem[k]) == 'object'
+                            && typeof(v) == 'object') {
+                        if (k == "style" && MochiKit.Style) {
+                            MochiKit.Style.setStyle(elem, v);
+                        } else {
+                            updatetree(elem[k], v);
+                        }
+                    } else if (k.substring(0, 2) == "on") {
+                        if (typeof(v) == "string") {
+                            v = new Function(v);
+                        }
+                        elem[k] = v;
+                    } else {
+                        elem.setAttribute(k, v);
+                    }
+                }
+            }
+        }
+        return elem;
+    },
+
+    /** @id MochiKit.DOM.appendChildNodes */
+    appendChildNodes: function (node/*, nodes...*/) {
+        var elem = node;
+        var self = MochiKit.DOM;
+        if (typeof(node) == 'string') {
+            elem = self.getElement(node);
+        }
+        var nodeStack = [
+            self.coerceToDOM(
+                MochiKit.Base.extend(null, arguments, 1),
+                elem
+            )
+        ];
+        var concat = MochiKit.Base.concat;
+        while (nodeStack.length) {
+            var n = nodeStack.shift();
+            if (typeof(n) == 'undefined' || n === null) {
+                // pass
+            } else if (typeof(n.nodeType) == 'number') {
+                elem.appendChild(n);
+            } else {
+                nodeStack = concat(n, nodeStack);
+            }
+        }
+        return elem;
+    },
+
+
+    /** @id MochiKit.DOM.insertSiblingNodesBefore */
+    insertSiblingNodesBefore: function (node/*, nodes...*/) {
+        var elem = node;
+        var self = MochiKit.DOM;
+        if (typeof(node) == 'string') {
+            elem = self.getElement(node);
+        }
+        var nodeStack = [
+            self.coerceToDOM(
+                MochiKit.Base.extend(null, arguments, 1),
+                elem
+            )
+        ];
+        var parentnode = elem.parentNode;
+        var concat = MochiKit.Base.concat;
+        while (nodeStack.length) {
+            var n = nodeStack.shift();
+            if (typeof(n) == 'undefined' || n === null) {
+                // pass
+            } else if (typeof(n.nodeType) == 'number') {
+                parentnode.insertBefore(n, elem);
+            } else {
+                nodeStack = concat(n, nodeStack);
+            }
+        }
+        return parentnode;
+    },
+
+    /** @id MochiKit.DOM.insertSiblingNodesAfter */
+    insertSiblingNodesAfter: function (node/*, nodes...*/) {
+        var elem = node;
+        var self = MochiKit.DOM;
+
+        if (typeof(node) == 'string') {
+            elem = self.getElement(node);
+        }
+        var nodeStack = [
+            self.coerceToDOM(
+                MochiKit.Base.extend(null, arguments, 1),
+                elem
+            )
+        ];
+
+        if (elem.nextSibling) {
+            return self.insertSiblingNodesBefore(elem.nextSibling, nodeStack);
+        }
+        else {
+            return self.appendChildNodes(elem.parentNode, nodeStack);
+        }
+    },
+
+    /** @id MochiKit.DOM.replaceChildNodes */
+    replaceChildNodes: function (node/*, nodes...*/) {
+        var elem = node;
+        var self = MochiKit.DOM;
+        if (typeof(node) == 'string') {
+            elem = self.getElement(node);
+            arguments[0] = elem;
+        }
+        var child;
+        while ((child = elem.firstChild)) {
+            elem.removeChild(child);
+        }
+        if (arguments.length < 2) {
+            return elem;
+        } else {
+            return self.appendChildNodes.apply(this, arguments);
+        }
+    },
+
+    /** @id MochiKit.DOM.createDOM */
+    createDOM: function (name, attrs/*, nodes... */) {
+        var elem;
+        var self = MochiKit.DOM;
+        var m = MochiKit.Base;
+        if (typeof(attrs) == "string" || typeof(attrs) == "number") {
+            var args = m.extend([name, null], arguments, 1);
+            return arguments.callee.apply(this, args);
+        }
+        if (typeof(name) == 'string') {
+            // Internet Explorer is dumb
+            var xhtml = self._xhtml;
+            if (attrs && !self.attributeArray.compliant) {
+                // http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/name_2.asp
+                var contents = "";
+                if ('name' in attrs) {
+                    contents += ' name="' + self.escapeHTML(attrs.name) + '"';
+                }
+                if (name == 'input' && 'type' in attrs) {
+                    contents += ' type="' + self.escapeHTML(attrs.type) + '"';
+                }
+                if (contents) {
+                    name = "<" + name + contents + ">";
+                    xhtml = false;
+                }
+            }
+            var d = self._document;
+            if (xhtml && d === document) {
+                elem = d.createElementNS("http://www.w3.org/1999/xhtml", name);
+            } else {
+                elem = d.createElement(name);
+            }
+        } else {
+            elem = name;
+        }
+        if (attrs) {
+            self.updateNodeAttributes(elem, attrs);
+        }
+        if (arguments.length <= 2) {
+            return elem;
+        } else {
+            var args = m.extend([elem], arguments, 2);
+            return self.appendChildNodes.apply(this, args);
+        }
+    },
+
+    /** @id MochiKit.DOM.createDOMFunc */
+    createDOMFunc: function (/* tag, attrs, *nodes */) {
+        var m = MochiKit.Base;
+        return m.partial.apply(
+            this,
+            m.extend([MochiKit.DOM.createDOM], arguments)
+        );
+    },
+
+    /** @id MochiKit.DOM.removeElement */
+    removeElement: function (elem) {
+        var e = MochiKit.DOM.getElement(elem);
+        e.parentNode.removeChild(e);
+        return e;
+    },
+
+    /** @id MochiKit.DOM.swapDOM */
+    swapDOM: function (dest, src) {
+        var self = MochiKit.DOM;
+        dest = self.getElement(dest);
+        var parent = dest.parentNode;
+        if (src) {
+            src = self.getElement(src);
+            parent.replaceChild(src, dest);
+        } else {
+            parent.removeChild(dest);
+        }
+        return src;
+    },
+
+    /** @id MochiKit.DOM.getElement */
+    getElement: function (id) {
+        var self = MochiKit.DOM;
+        if (arguments.length == 1) {
+            return ((typeof(id) == "string") ?
+                self._document.getElementById(id) : id);
+        } else {
+            return MochiKit.Base.map(self.getElement, arguments);
+        }
+    },
+
+    /** @id MochiKit.DOM.getElementsByTagAndClassName */
+    getElementsByTagAndClassName: function (tagName, className,
+            /* optional */parent) {
+        var self = MochiKit.DOM;
+        if (typeof(tagName) == 'undefined' || tagName === null) {
+            tagName = '*';
+        }
+        if (typeof(parent) == 'undefined' || parent === null) {
+            parent = self._document;
+        }
+        parent = self.getElement(parent);
+        var children = (parent.getElementsByTagName(tagName)
+            || self._document.all);
+        if (typeof(className) == 'undefined' || className === null) {
+            return MochiKit.Base.extend(null, children);
+        }
+
+        var elements = [];
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            var cls = child.className;
+            if (!cls) {
+                continue;
+            }
+            var classNames = cls.split(' ');
+            for (var j = 0; j < classNames.length; j++) {
+                if (classNames[j] == className) {
+                    elements.push(child);
+                    break;
+                }
+            }
+        }
+
+        return elements;
+    },
+
+    _newCallStack: function (path, once) {
+        var rval = function () {
+            var callStack = arguments.callee.callStack;
+            for (var i = 0; i < callStack.length; i++) {
+                if (callStack[i].apply(this, arguments) === false) {
+                    break;
+                }
+            }
+            if (once) {
+                try {
+                    this[path] = null;
+                } catch (e) {
+                    // pass
+                }
+            }
+        };
+        rval.callStack = [];
+        return rval;
+    },
+
+    /** @id MochiKit.DOM.addToCallStack */
+    addToCallStack: function (target, path, func, once) {
+        var self = MochiKit.DOM;
+        var existing = target[path];
+        var regfunc = existing;
+        if (!(typeof(existing) == 'function'
+                && typeof(existing.callStack) == "object"
+                && existing.callStack !== null)) {
+            regfunc = self._newCallStack(path, once);
+            if (typeof(existing) == 'function') {
+                regfunc.callStack.push(existing);
+            }
+            target[path] = regfunc;
+        }
+        regfunc.callStack.push(func);
+    },
+
+    /** @id MochiKit.DOM.addLoadEvent */
+    addLoadEvent: function (func) {
+        var self = MochiKit.DOM;
+        self.addToCallStack(self._window, "onload", func, true);
+
+    },
+
+    /** @id MochiKit.DOM.focusOnLoad */
+    focusOnLoad: function (element) {
+        var self = MochiKit.DOM;
+        self.addLoadEvent(function () {
+            element = self.getElement(element);
+            if (element) {
+                element.focus();
+            }
+        });
+    },
+
+    /** @id MochiKit.DOM.setElementClass */
+    setElementClass: function (element, className) {
+        var self = MochiKit.DOM;
+        var obj = self.getElement(element);
+        if (self.attributeArray.compliant) {
+            obj.setAttribute("class", className);
+        } else {
+            obj.setAttribute("className", className);
+        }
+    },
+
+    /** @id MochiKit.DOM.toggleElementClass */
+    toggleElementClass: function (className/*, element... */) {
+        var self = MochiKit.DOM;
+        for (var i = 1; i < arguments.length; i++) {
+            var obj = self.getElement(arguments[i]);
+            if (!self.addElementClass(obj, className)) {
+                self.removeElementClass(obj, className);
+            }
+        }
+    },
+
+    /** @id MochiKit.DOM.addElementClass */
+    addElementClass: function (element, className) {
+        var self = MochiKit.DOM;
+        var obj = self.getElement(element);
+        var cls = obj.className;
+        // trivial case, no className yet
+        if (cls == undefined || cls.length === 0) {
+            self.setElementClass(obj, className);
+            return true;
+        }
+        // the other trivial case, already set as the only class
+        if (cls == className) {
+            return false;
+        }
+        var classes = cls.split(" ");
+        for (var i = 0; i < classes.length; i++) {
+            // already present
+            if (classes[i] == className) {
+                return false;
+            }
+        }
+        // append class
+        self.setElementClass(obj, cls + " " + className);
+        return true;
+    },
+
+    /** @id MochiKit.DOM.removeElementClass */
+    removeElementClass: function (element, className) {
+        var self = MochiKit.DOM;
+        var obj = self.getElement(element);
+        var cls = obj.className;
+        // trivial case, no className yet
+        if (cls == undefined || cls.length === 0) {
+            return false;
+        }
+        // other trivial case, set only to className
+        if (cls == className) {
+            self.setElementClass(obj, "");
+            return true;
+        }
+        var classes = cls.split(" ");
+        for (var i = 0; i < classes.length; i++) {
+            // already present
+            if (classes[i] == className) {
+                // only check sane case where the class is used once
+                classes.splice(i, 1);
+                self.setElementClass(obj, classes.join(" "));
+                return true;
+            }
+        }
+        // not found
+        return false;
+    },
+
+    /** @id MochiKit.DOM.swapElementClass */
+    swapElementClass: function (element, fromClass, toClass) {
+        var obj = MochiKit.DOM.getElement(element);
+        var res = MochiKit.DOM.removeElementClass(obj, fromClass);
+        if (res) {
+            MochiKit.DOM.addElementClass(obj, toClass);
+        }
+        return res;
+    },
+
+    /** @id MochiKit.DOM.hasElementClass */
+    hasElementClass: function (element, className/*...*/) {
+        var obj = MochiKit.DOM.getElement(element);
+        var cls = obj.className;
+        if (!cls) {
+            return false;
+        }
+        var classes = cls.split(" ");
+        for (var i = 1; i < arguments.length; i++) {
+            var good = false;
+            for (var j = 0; j < classes.length; j++) {
+                if (classes[j] == arguments[i]) {
+                    good = true;
+                    break;
+                }
+            }
+            if (!good) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.DOM.escapeHTML */
+    escapeHTML: function (s) {
+        return s.replace(/&/g, "&amp;"
+            ).replace(/"/g, "&quot;"
+            ).replace(/</g, "&lt;"
+            ).replace(/>/g, "&gt;");
+    },
+
+    /** @id MochiKit.DOM.toHTML */
+    toHTML: function (dom) {
+        return MochiKit.DOM.emitHTML(dom).join("");
+    },
+
+    /** @id MochiKit.DOM.emitHTML */
+    emitHTML: function (dom, /* optional */lst) {
+        if (typeof(lst) == 'undefined' || lst === null) {
+            lst = [];
+        }
+        // queue is the call stack, we're doing this non-recursively
+        var queue = [dom];
+        var self = MochiKit.DOM;
+        var escapeHTML = self.escapeHTML;
+        var attributeArray = self.attributeArray;
+        while (queue.length) {
+            dom = queue.pop();
+            if (typeof(dom) == 'string') {
+                lst.push(dom);
+            } else if (dom.nodeType == 1) {
+                // we're not using higher order stuff here
+                // because safari has heisenbugs.. argh.
+                //
+                // I think it might have something to do with
+                // garbage collection and function calls.
+                lst.push('<' + dom.tagName.toLowerCase());
+                var attributes = [];
+                var domAttr = attributeArray(dom);
+                for (var i = 0; i < domAttr.length; i++) {
+                    var a = domAttr[i];
+                    attributes.push([
+                        " ",
+                        a.name,
+                        '="',
+                        escapeHTML(a.value),
+                        '"'
+                    ]);
+                }
+                attributes.sort();
+                for (i = 0; i < attributes.length; i++) {
+                    var attrs = attributes[i];
+                    for (var j = 0; j < attrs.length; j++) {
+                        lst.push(attrs[j]);
+                    }
+                }
+                if (dom.hasChildNodes()) {
+                    lst.push(">");
+                    // queue is the FILO call stack, so we put the close tag
+                    // on first
+                    queue.push("</" + dom.tagName.toLowerCase() + ">");
+                    var cnodes = dom.childNodes;
+                    for (i = cnodes.length - 1; i >= 0; i--) {
+                        queue.push(cnodes[i]);
+                    }
+                } else {
+                    lst.push('/>');
+                }
+            } else if (dom.nodeType == 3) {
+                lst.push(escapeHTML(dom.nodeValue));
+            }
+        }
+        return lst;
+    },
+
+    /** @id MochiKit.DOM.scrapeText */
+    scrapeText: function (node, /* optional */asArray) {
+        var rval = [];
+        (function (node) {
+            var cn = node.childNodes;
+            if (cn) {
+                for (var i = 0; i < cn.length; i++) {
+                    arguments.callee.call(this, cn[i]);
+                }
+            }
+            var nodeValue = node.nodeValue;
+            if (typeof(nodeValue) == 'string') {
+                rval.push(nodeValue);
+            }
+        })(MochiKit.DOM.getElement(node));
+        if (asArray) {
+            return rval;
+        } else {
+            return rval.join("");
+        }
+    },
+
+    /** @id MochiKit.DOM.removeEmptyTextNodes */
+    removeEmptyTextNodes: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        for (var i = 0; i < element.childNodes.length; i++) {
+            var node = element.childNodes[i];
+            if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) {
+                node.parentNode.removeChild(node);
+            }
+        }
+    },
+
+    /** @id MochiKit.DOM.makeClipping */
+    makeClipping: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        var oldOverflow = element.style.overflow;
+        if ((MochiKit.Style.getStyle(element, 'overflow') || 'visible') != 'hidden') {
+            element.style.overflow = 'hidden';
+        }
+        return oldOverflow;
+    },
+
+    /** @id MochiKit.DOM.undoClipping */
+    undoClipping: function (element, overflow) {
+        element = MochiKit.DOM.getElement(element);
+        if (!overflow) {
+            return;
+        }
+        element.style.overflow = overflow;
+    },
+
+    /** @id MochiKit.DOM.makePositioned */
+    makePositioned: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        var pos = MochiKit.Style.getStyle(element, 'position');
+        if (pos == 'static' || !pos) {
+            element.style.position = 'relative';
+            // Opera returns the offset relative to the positioning context,
+            // when an element is position relative but top and left have
+            // not been defined
+            if (/Opera/.test(navigator.userAgent)) {
+                element.style.top = 0;
+                element.style.left = 0;
+            }
+        }
+    },
+
+    /** @id MochiKit.DOM.undoPositioned */
+    undoPositioned: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        if (element.style.position == 'relative') {
+            element.style.position = element.style.top = element.style.left = element.style.bottom = element.style.right = '';
+        }
+    },
+
+    /** @id MochiKit.DOM.getFirstElementByTagAndClassName */
+    getFirstElementByTagAndClassName: function (tagName, className,
+            /* optional */parent) {
+        var self = MochiKit.DOM;
+        if (typeof(tagName) == 'undefined' || tagName === null) {
+            tagName = '*';
+        }
+        if (typeof(parent) == 'undefined' || parent === null) {
+            parent = self._document;
+        }
+        parent = self.getElement(parent);
+        var children = (parent.getElementsByTagName(tagName)
+            || self._document.all);
+        if (typeof(className) == 'undefined' || className === null) {
+            return children[0];
+        }
+
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            var classNames = child.className.split(' ');
+            for (var j = 0; j < classNames.length; j++) {
+                if (classNames[j] == className) {
+                    return child;
+                }
+            }
+        }
+    },
+
+    /** @id MochiKit.DOM.getFirstParentByTagAndClassName */
+    getFirstParentByTagAndClassName: function (elem, tagName, className) {
+        var self = MochiKit.DOM;
+        elem = self.getElement(elem);
+        if (typeof(tagName) == 'undefined' || tagName === null) {
+            tagName = '*';
+        } else {
+            tagName = tagName.toUpperCase();
+        }
+        if (typeof(className) == 'undefined' || className === null) {
+            className = null;
+        }
+
+        var classList = '';
+        var curTagName = '';
+        while (elem && elem.tagName) {
+            elem = elem.parentNode;
+            if (tagName == '*' && className === null) {
+                return elem;
+            }
+            classList = elem.className.split(' ');
+            curTagName = elem.tagName.toUpperCase();
+            if (className === null && tagName == curTagName) {
+                return elem;
+            } else if (className !== null) {
+                for (var i = 0; i < classList.length; i++) {
+                    if (tagName == '*' && classList[i] == className) {
+                        return elem;
+                    } else if (tagName == curTagName && classList[i] == className) {
+                        return elem;
+                    }
+                }
+            }
+        }
+        return elem;
+    },
+
+    /** @id MochiKit.DOM.isParent */
+    isParent: function (child, element) {
+        if (!child.parentNode || child == element) {
+            return false;
+        }
+
+        if (child.parentNode == element) {
+            return true;
+        }
+
+        return MochiKit.DOM.isParent(child.parentNode, element);
+    },
+
+    __new__: function (win) {
+
+        var m = MochiKit.Base;
+        if (typeof(document) != "undefined") {
+            this._document = document;
+            var kXULNSURI = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            this._xhtml = (document.documentElement &&
+                document.createElementNS &&
+                document.documentElement.namespaceURI === kXULNSURI);
+        } else if (MochiKit.MockDOM) {
+            this._document = MochiKit.MockDOM.document;
+        }
+        this._window = win;
+
+        this.domConverters = new m.AdapterRegistry();
+
+        var __tmpElement = this._document.createElement("span");
+        var attributeArray;
+        if (__tmpElement && __tmpElement.attributes &&
+                __tmpElement.attributes.length > 0) {
+            // for braindead browsers (IE) that insert extra junk
+            var filter = m.filter;
+            attributeArray = function (node) {
+                return filter(attributeArray.ignoreAttrFilter, node.attributes);
+            };
+            attributeArray.ignoreAttr = {};
+            var attrs = __tmpElement.attributes;
+            var ignoreAttr = attributeArray.ignoreAttr;
+            for (var i = 0; i < attrs.length; i++) {
+                var a = attrs[i];
+                ignoreAttr[a.name] = a.value;
+            }
+            attributeArray.ignoreAttrFilter = function (a) {
+                return (attributeArray.ignoreAttr[a.name] != a.value);
+            };
+            attributeArray.compliant = false;
+            attributeArray.renames = {
+                "class": "className",
+                "checked": "defaultChecked",
+                "usemap": "useMap",
+                "for": "htmlFor",
+                "readonly": "readOnly",
+                "colspan": "colSpan",
+                "bgcolor": "bgColor",
+                "cellspacing": "cellSpacing",
+                "cellpadding": "cellPadding"
+            };
+        } else {
+            attributeArray = function (node) {
+                /***
+
+                    Return an array of attributes for a given node,
+                    filtering out attributes that don't belong for
+                    that are inserted by "Certain Browsers".
+
+                ***/
+                return node.attributes;
+            };
+            attributeArray.compliant = true;
+            attributeArray.renames = {};
+        }
+        this.attributeArray = attributeArray;
+
+        // FIXME: this really belongs in Base, and could probably be cleaner
+        var _deprecated = function(fromModule, arr) {
+            var modules = arr[1].split('.');
+            var str = '';
+            var obj = {};
+
+            str += 'if (!MochiKit.' + modules[1] + ') { throw new Error("';
+            str += 'This function has been deprecated and depends on MochiKit.';
+            str += modules[1] + '.");}';
+            str += 'return MochiKit.' + modules[1] + '.' + arr[0];
+            str += '.apply(this, arguments);';
+
+            obj[modules[2]] = new Function(str);
+            MochiKit.Base.update(MochiKit[fromModule], obj);
+        }
+        for (var i; i < MochiKit.DOM.DEPRECATED.length; i++) {
+            _deprecated('DOM', MochiKit.DOM.DEPRECATED[i]);
+        }
+
+        // shorthand for createDOM syntax
+        var createDOMFunc = this.createDOMFunc;
+        /** @id MochiKit.DOM.UL */
+        this.UL = createDOMFunc("ul");
+        /** @id MochiKit.DOM.OL */
+        this.OL = createDOMFunc("ol");
+        /** @id MochiKit.DOM.LI */
+        this.LI = createDOMFunc("li");
+        /** @id MochiKit.DOM.TD */
+        this.TD = createDOMFunc("td");
+        /** @id MochiKit.DOM.TR */
+        this.TR = createDOMFunc("tr");
+        /** @id MochiKit.DOM.TBODY */
+        this.TBODY = createDOMFunc("tbody");
+        /** @id MochiKit.DOM.THEAD */
+        this.THEAD = createDOMFunc("thead");
+        /** @id MochiKit.DOM.TFOOT */
+        this.TFOOT = createDOMFunc("tfoot");
+        /** @id MochiKit.DOM.TABLE */
+        this.TABLE = createDOMFunc("table");
+        /** @id MochiKit.DOM.TH */
+        this.TH = createDOMFunc("th");
+        /** @id MochiKit.DOM.INPUT */
+        this.INPUT = createDOMFunc("input");
+        /** @id MochiKit.DOM.SPAN */
+        this.SPAN = createDOMFunc("span");
+        /** @id MochiKit.DOM.A */
+        this.A = createDOMFunc("a");
+        /** @id MochiKit.DOM.DIV */
+        this.DIV = createDOMFunc("div");
+        /** @id MochiKit.DOM.IMG */
+        this.IMG = createDOMFunc("img");
+        /** @id MochiKit.DOM.BUTTON */
+        this.BUTTON = createDOMFunc("button");
+        /** @id MochiKit.DOM.TT */
+        this.TT = createDOMFunc("tt");
+        /** @id MochiKit.DOM.PRE */
+        this.PRE = createDOMFunc("pre");
+        /** @id MochiKit.DOM.H1 */
+        this.H1 = createDOMFunc("h1");
+        /** @id MochiKit.DOM.H2 */
+        this.H2 = createDOMFunc("h2");
+        /** @id MochiKit.DOM.H3 */
+        this.H3 = createDOMFunc("h3");
+        /** @id MochiKit.DOM.BR */
+        this.BR = createDOMFunc("br");
+        /** @id MochiKit.DOM.HR */
+        this.HR = createDOMFunc("hr");
+        /** @id MochiKit.DOM.LABEL */
+        this.LABEL = createDOMFunc("label");
+        /** @id MochiKit.DOM.TEXTAREA */
+        this.TEXTAREA = createDOMFunc("textarea");
+        /** @id MochiKit.DOM.FORM */
+        this.FORM = createDOMFunc("form");
+        /** @id MochiKit.DOM.P */
+        this.P = createDOMFunc("p");
+        /** @id MochiKit.DOM.SELECT */
+        this.SELECT = createDOMFunc("select");
+        /** @id MochiKit.DOM.OPTION */
+        this.OPTION = createDOMFunc("option");
+        /** @id MochiKit.DOM.OPTGROUP */
+        this.OPTGROUP = createDOMFunc("optgroup");
+        /** @id MochiKit.DOM.LEGEND */
+        this.LEGEND = createDOMFunc("legend");
+        /** @id MochiKit.DOM.FIELDSET */
+        this.FIELDSET = createDOMFunc("fieldset");
+        /** @id MochiKit.DOM.STRONG */
+        this.STRONG = createDOMFunc("strong");
+        /** @id MochiKit.DOM.CANVAS */
+        this.CANVAS = createDOMFunc("canvas");
+
+        /** @id MochiKit.DOM.$ */
+        this.$ = this.getElement;
+
+        this.EXPORT_TAGS = {
+            ":common": this.EXPORT,
+            ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+        };
+
+        m.nameFunctions(this);
+
+    }
+});
+
+
+MochiKit.DOM.__new__(((typeof(window) == "undefined") ? this : window));
+
+//
+// XXX: Internet Explorer blows
+//
+if (MochiKit.__export__) {
+    withWindow = MochiKit.DOM.withWindow;
+    withDocument = MochiKit.DOM.withDocument;
+}
+
+MochiKit.Base._exportSymbols(this, MochiKit.DOM);
diff --git a/IPython/external/external/MochiKit/DateTime.js b/IPython/external/external/MochiKit/DateTime.js
new file mode 100644
index 0000000..c0b03ee
--- /dev/null
+++ b/IPython/external/external/MochiKit/DateTime.js
@@ -0,0 +1,216 @@
+/***
+
+MochiKit.DateTime 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.DateTime');
+}
+
+if (typeof(MochiKit) == 'undefined') {
+    MochiKit = {};
+}
+
+if (typeof(MochiKit.DateTime) == 'undefined') {
+    MochiKit.DateTime = {};
+}
+
+MochiKit.DateTime.NAME = "MochiKit.DateTime";
+MochiKit.DateTime.VERSION = "1.4";
+MochiKit.DateTime.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+MochiKit.DateTime.toString = function () {
+    return this.__repr__();
+};
+
+/** @id MochiKit.DateTime.isoDate */
+MochiKit.DateTime.isoDate = function (str) {
+    str = str + "";
+    if (typeof(str) != "string" || str.length === 0) {
+        return null;
+    }
+    var iso = str.split('-');
+    if (iso.length === 0) {
+        return null;
+    }
+    return new Date(iso[0], iso[1] - 1, iso[2]);
+};
+
+MochiKit.DateTime._isoRegexp = /(\d{4,})(?:-(\d{1,2})(?:-(\d{1,2})(?:[T ](\d{1,2}):(\d{1,2})(?::(\d{1,2})(?:\.(\d+))?)?(?:(Z)|([+-])(\d{1,2})(?::(\d{1,2}))?)?)?)?)?/;
+
+/** @id MochiKit.DateTime.isoTimestamp */
+MochiKit.DateTime.isoTimestamp = function (str) {
+    str = str + "";
+    if (typeof(str) != "string" || str.length === 0) {
+        return null;
+    }
+    var res = str.match(MochiKit.DateTime._isoRegexp);
+    if (typeof(res) == "undefined" || res === null) {
+        return null;
+    }
+    var year, month, day, hour, min, sec, msec;
+    year = parseInt(res[1], 10);
+    if (typeof(res[2]) == "undefined" || res[2] === '') {
+        return new Date(year);
+    }
+    month = parseInt(res[2], 10) - 1;
+    day = parseInt(res[3], 10);
+    if (typeof(res[4]) == "undefined" || res[4] === '') {
+        return new Date(year, month, day);
+    }
+    hour = parseInt(res[4], 10);
+    min = parseInt(res[5], 10);
+    sec = (typeof(res[6]) != "undefined" && res[6] !== '') ? parseInt(res[6], 10) : 0;
+    if (typeof(res[7]) != "undefined" && res[7] !== '') {
+        msec = Math.round(1000.0 * parseFloat("0." + res[7]));
+    } else {
+        msec = 0;
+    }
+    if ((typeof(res[8]) == "undefined" || res[8] === '') && (typeof(res[9]) == "undefined" || res[9] === '')) {
+        return new Date(year, month, day, hour, min, sec, msec);
+    }
+    var ofs;
+    if (typeof(res[9]) != "undefined" && res[9] !== '') {
+        ofs = parseInt(res[10], 10) * 3600000;
+        if (typeof(res[11]) != "undefined" && res[11] !== '') {
+            ofs += parseInt(res[11], 10) * 60000;
+        }
+        if (res[9] == "-") {
+            ofs = -ofs;
+        }
+    } else {
+        ofs = 0;
+    }
+    return new Date(Date.UTC(year, month, day, hour, min, sec, msec) - ofs);
+};
+
+/** @id MochiKit.DateTime.toISOTime */
+MochiKit.DateTime.toISOTime = function (date, realISO/* = false */) {
+    if (typeof(date) == "undefined" || date === null) {
+        return null;
+    }
+    var hh = date.getHours();
+    var mm = date.getMinutes();
+    var ss = date.getSeconds();
+    var lst = [
+        ((realISO && (hh < 10)) ? "0" + hh : hh),
+        ((mm < 10) ? "0" + mm : mm),
+        ((ss < 10) ? "0" + ss : ss)
+    ];
+    return lst.join(":");
+};
+
+/** @id MochiKit.DateTime.toISOTimeStamp */
+MochiKit.DateTime.toISOTimestamp = function (date, realISO/* = false*/) {
+    if (typeof(date) == "undefined" || date === null) {
+        return null;
+    }
+    var sep = realISO ? "T" : " ";
+    var foot = realISO ? "Z" : "";
+    if (realISO) {
+        date = new Date(date.getTime() + (date.getTimezoneOffset() * 60000));
+    }
+    return MochiKit.DateTime.toISODate(date) + sep + MochiKit.DateTime.toISOTime(date, realISO) + foot;
+};
+
+/** @id MochiKit.DateTime.toISODate */
+MochiKit.DateTime.toISODate = function (date) {
+    if (typeof(date) == "undefined" || date === null) {
+        return null;
+    }
+    var _padTwo = MochiKit.DateTime._padTwo;
+    return [
+        date.getFullYear(),
+        _padTwo(date.getMonth() + 1),
+        _padTwo(date.getDate())
+    ].join("-");
+};
+
+/** @id MochiKit.DateTime.americanDate */
+MochiKit.DateTime.americanDate = function (d) {
+    d = d + "";
+    if (typeof(d) != "string" || d.length === 0) {
+        return null;
+    }
+    var a = d.split('/');
+    return new Date(a[2], a[0] - 1, a[1]);
+};
+
+MochiKit.DateTime._padTwo = function (n) {
+    return (n > 9) ? n : "0" + n;
+};
+
+/** @id MochiKit.DateTime.toPaddedAmericanDate */
+MochiKit.DateTime.toPaddedAmericanDate = function (d) {
+    if (typeof(d) == "undefined" || d === null) {
+        return null;
+    }
+    var _padTwo = MochiKit.DateTime._padTwo;
+    return [
+        _padTwo(d.getMonth() + 1),
+        _padTwo(d.getDate()),
+        d.getFullYear()
+    ].join('/');
+};
+
+/** @id MochiKit.DateTime.toAmericanDate */
+MochiKit.DateTime.toAmericanDate = function (d) {
+    if (typeof(d) == "undefined" || d === null) {
+        return null;
+    }
+    return [d.getMonth() + 1, d.getDate(), d.getFullYear()].join('/');
+};
+
+MochiKit.DateTime.EXPORT = [
+    "isoDate",
+    "isoTimestamp",
+    "toISOTime",
+    "toISOTimestamp",
+    "toISODate",
+    "americanDate",
+    "toPaddedAmericanDate",
+    "toAmericanDate"
+];
+
+MochiKit.DateTime.EXPORT_OK = [];
+MochiKit.DateTime.EXPORT_TAGS = {
+    ":common": MochiKit.DateTime.EXPORT,
+    ":all": MochiKit.DateTime.EXPORT
+};
+
+MochiKit.DateTime.__new__ = function () {
+    // MochiKit.Base.nameFunctions(this);
+    var base = this.NAME + ".";
+    for (var k in this) {
+        var o = this[k];
+        if (typeof(o) == 'function' && typeof(o.NAME) == 'undefined') {
+            try {
+                o.NAME = base + k;
+            } catch (e) {
+                // pass
+            }
+        }
+    }
+};
+
+MochiKit.DateTime.__new__();
+
+if (typeof(MochiKit.Base) != "undefined") {
+    MochiKit.Base._exportSymbols(this, MochiKit.DateTime);
+} else {
+    (function (globals, module) {
+        if ((typeof(JSAN) == 'undefined' && typeof(dojo) == 'undefined')
+            || (MochiKit.__export__ === false)) {
+            var all = module.EXPORT_TAGS[":all"];
+            for (var i = 0; i < all.length; i++) {
+                globals[all[i]] = module[all[i]];
+            }
+        }
+    })(this, MochiKit.DateTime);
+}
diff --git a/IPython/external/external/MochiKit/DragAndDrop.js b/IPython/external/external/MochiKit/DragAndDrop.js
new file mode 100644
index 0000000..47fdb3b
--- /dev/null
+++ b/IPython/external/external/MochiKit/DragAndDrop.js
@@ -0,0 +1,824 @@
+/***
+MochiKit.DragAndDrop 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+    Mochi-ized By Thomas Herve (_firstname_@nimail.org)
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.DragAndDrop');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Iter');
+    dojo.require('MochiKit.Visual');
+    dojo.require('MochiKit.Signal');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+    JSAN.use("MochiKit.DOM", []);
+    JSAN.use("MochiKit.Visual", []);
+    JSAN.use("MochiKit.Iter", []);
+    JSAN.use("MochiKit.Signal", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined' ||
+        typeof(MochiKit.DOM) == 'undefined' ||
+        typeof(MochiKit.Visual) == 'undefined' ||
+        typeof(MochiKit.Signal) == 'undefined' ||
+        typeof(MochiKit.Iter) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.DragAndDrop depends on MochiKit.Base, MochiKit.DOM, MochiKit.Visual, MochiKit.Signal and MochiKit.Iter!";
+}
+
+if (typeof(MochiKit.DragAndDrop) == 'undefined') {
+    MochiKit.DragAndDrop = {};
+}
+
+MochiKit.DragAndDrop.NAME = 'MochiKit.DragAndDrop';
+MochiKit.DragAndDrop.VERSION = '1.4';
+
+MochiKit.DragAndDrop.__repr__ = function () {
+    return '[' + this.NAME + ' ' + this.VERSION + ']';
+};
+
+MochiKit.DragAndDrop.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.DragAndDrop.EXPORT = [
+    "Droppable",
+    "Draggable"
+];
+
+MochiKit.DragAndDrop.EXPORT_OK = [
+    "Droppables",
+    "Draggables"
+];
+
+MochiKit.DragAndDrop.Droppables = {
+    /***
+
+    Manage all droppables. Shouldn't be used, use the Droppable object instead.
+
+    ***/
+    drops: [],
+
+    remove: function (element) {
+        this.drops = MochiKit.Base.filter(function (d) {
+            return d.element != MochiKit.DOM.getElement(element);
+        }, this.drops);
+    },
+
+    register: function (drop) {
+        this.drops.push(drop);
+    },
+
+    unregister: function (drop) {
+        this.drops = MochiKit.Base.filter(function (d) {
+            return d != drop;
+        }, this.drops);
+    },
+
+    prepare: function (element) {
+        MochiKit.Base.map(function (drop) {
+            if (drop.isAccepted(element)) {
+                if (drop.options.activeclass) {
+                    MochiKit.DOM.addElementClass(drop.element,
+                                                 drop.options.activeclass);
+                }
+                drop.options.onactive(drop.element, element);
+            }
+        }, this.drops);
+    },
+
+    findDeepestChild: function (drops) {
+        deepest = drops[0];
+
+        for (i = 1; i < drops.length; ++i) {
+            if (MochiKit.DOM.isParent(drops[i].element, deepest.element)) {
+                deepest = drops[i];
+            }
+        }
+        return deepest;
+    },
+
+    show: function (point, element) {
+        if (!this.drops.length) {
+            return;
+        }
+        var affected = [];
+
+        if (this.last_active) {
+            this.last_active.deactivate();
+        }
+        MochiKit.Iter.forEach(this.drops, function (drop) {
+            if (drop.isAffected(point, element)) {
+                affected.push(drop);
+            }
+        });
+        if (affected.length > 0) {
+            drop = this.findDeepestChild(affected);
+            MochiKit.Position.within(drop.element, point.page.x, point.page.y);
+            drop.options.onhover(element, drop.element,
+                MochiKit.Position.overlap(drop.options.overlap, drop.element));
+            drop.activate();
+        }
+    },
+
+    fire: function (event, element) {
+        if (!this.last_active) {
+            return;
+        }
+        MochiKit.Position.prepare();
+
+        if (this.last_active.isAffected(event.mouse(), element)) {
+            this.last_active.options.ondrop(element,
+               this.last_active.element, event);
+        }
+    },
+
+    reset: function (element) {
+        MochiKit.Base.map(function (drop) {
+            if (drop.options.activeclass) {
+                MochiKit.DOM.removeElementClass(drop.element,
+                                                drop.options.activeclass);
+            }
+            drop.options.ondesactive(drop.element, element);
+        }, this.drops);
+        if (this.last_active) {
+            this.last_active.deactivate();
+        }
+    }
+};
+
+/** @id MochiKit.DragAndDrop.Droppable */
+MochiKit.DragAndDrop.Droppable = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.DragAndDrop.Droppable.prototype = {
+    /***
+
+    A droppable object. Simple use is to create giving an element:
+
+        new MochiKit.DragAndDrop.Droppable('myelement');
+
+    Generally you'll want to define the 'ondrop' function and maybe the
+    'accept' option to filter draggables.
+
+    ***/
+    __class__: MochiKit.DragAndDrop.Droppable,
+
+    __init__: function (element, /* optional */options) {
+        var d = MochiKit.DOM;
+        var b = MochiKit.Base;
+        this.element = d.getElement(element);
+        this.options = b.update({
+
+            /** @id MochiKit.DragAndDrop.greedy */
+            greedy: true,
+
+            /** @id MochiKit.DragAndDrop.hoverclass */
+            hoverclass: null,
+
+            /** @id MochiKit.DragAndDrop.activeclass */
+            activeclass: null,
+
+            /** @id MochiKit.DragAndDrop.hoverfunc */
+            hoverfunc: b.noop,
+
+            /** @id MochiKit.DragAndDrop.accept */
+            accept: null,
+
+            /** @id MochiKit.DragAndDrop.onactive */
+            onactive: b.noop,
+
+            /** @id MochiKit.DragAndDrop.ondesactive */
+            ondesactive: b.noop,
+
+            /** @id MochiKit.DragAndDrop.onhover */
+            onhover: b.noop,
+
+            /** @id MochiKit.DragAndDrop.ondrop */
+            ondrop: b.noop,
+
+            /** @id MochiKit.DragAndDrop.containment */
+            containment: [],
+            tree: false
+        }, options);
+
+        // cache containers
+        this.options._containers = [];
+        b.map(MochiKit.Base.bind(function (c) {
+            this.options._containers.push(d.getElement(c));
+        }, this), this.options.containment);
+
+        d.makePositioned(this.element); // fix IE
+
+        MochiKit.DragAndDrop.Droppables.register(this);
+    },
+
+    /** @id MochiKit.DragAndDrop.isContained */
+    isContained: function (element) {
+        if (this.options._containers.length) {
+            var containmentNode;
+            if (this.options.tree) {
+                containmentNode = element.treeNode;
+            } else {
+                containmentNode = element.parentNode;
+            }
+            return MochiKit.Iter.some(this.options._containers, function (c) {
+                return containmentNode == c;
+            });
+        } else {
+            return true;
+        }
+    },
+
+    /** @id MochiKit.DragAndDrop.isAccepted */
+    isAccepted: function (element) {
+        return ((!this.options.accept) || MochiKit.Iter.some(
+          this.options.accept, function (c) {
+            return MochiKit.DOM.hasElementClass(element, c);
+        }));
+    },
+
+    /** @id MochiKit.DragAndDrop.isAffected */
+    isAffected: function (point, element) {
+        return ((this.element != element) &&
+                this.isContained(element) &&
+                this.isAccepted(element) &&
+                MochiKit.Position.within(this.element, point.page.x,
+                                                       point.page.y));
+    },
+
+    /** @id MochiKit.DragAndDrop.deactivate */
+    deactivate: function () {
+        /***
+
+        A droppable is deactivate when a draggable has been over it and left.
+
+        ***/
+        if (this.options.hoverclass) {
+            MochiKit.DOM.removeElementClass(this.element,
+                                            this.options.hoverclass);
+        }
+        this.options.hoverfunc(this.element, false);
+        MochiKit.DragAndDrop.Droppables.last_active = null;
+    },
+
+    /** @id MochiKit.DragAndDrop.activate */
+    activate: function () {
+        /***
+
+        A droppable is active when a draggable is over it.
+
+        ***/
+        if (this.options.hoverclass) {
+            MochiKit.DOM.addElementClass(this.element, this.options.hoverclass);
+        }
+        this.options.hoverfunc(this.element, true);
+        MochiKit.DragAndDrop.Droppables.last_active = this;
+    },
+
+    /** @id MochiKit.DragAndDrop.destroy */
+    destroy: function () {
+        /***
+
+        Delete this droppable.
+
+        ***/
+        MochiKit.DragAndDrop.Droppables.unregister(this);
+    },
+
+    /** @id MochiKit.DragAndDrop.repr */
+    repr: function () {
+        return '[' + this.__class__.NAME + ", options:" + MochiKit.Base.repr(this.options) + "]";
+    }
+};
+
+MochiKit.DragAndDrop.Draggables = {
+    /***
+
+    Manage draggables elements. Not intended to direct use.
+
+    ***/
+    drags: [],
+
+    register: function (draggable) {
+        if (this.drags.length === 0) {
+            var conn = MochiKit.Signal.connect;
+            this.eventMouseUp = conn(document, 'onmouseup', this, this.endDrag);
+            this.eventMouseMove = conn(document, 'onmousemove', this,
+                                       this.updateDrag);
+            this.eventKeypress = conn(document, 'onkeypress', this,
+                                      this.keyPress);
+        }
+        this.drags.push(draggable);
+    },
+
+    unregister: function (draggable) {
+        this.drags = MochiKit.Base.filter(function (d) {
+            return d != draggable;
+        }, this.drags);
+        if (this.drags.length === 0) {
+            var disc = MochiKit.Signal.disconnect;
+            disc(this.eventMouseUp);
+            disc(this.eventMouseMove);
+            disc(this.eventKeypress);
+        }
+    },
+
+    activate: function (draggable) {
+        // allows keypress events if window is not currently focused
+        // fails for Safari
+        window.focus();
+        this.activeDraggable = draggable;
+    },
+
+    deactivate: function () {
+        this.activeDraggable = null;
+    },
+
+    updateDrag: function (event) {
+        if (!this.activeDraggable) {
+            return;
+        }
+        var pointer = event.mouse();
+        // Mozilla-based browsers fire successive mousemove events with
+        // the same coordinates, prevent needless redrawing (moz bug?)
+        if (this._lastPointer && (MochiKit.Base.repr(this._lastPointer.page) ==
+                                  MochiKit.Base.repr(pointer.page))) {
+            return;
+        }
+        this._lastPointer = pointer;
+        this.activeDraggable.updateDrag(event, pointer);
+    },
+
+    endDrag: function (event) {
+        if (!this.activeDraggable) {
+            return;
+        }
+        this._lastPointer = null;
+        this.activeDraggable.endDrag(event);
+        this.activeDraggable = null;
+    },
+
+    keyPress: function (event) {
+        if (this.activeDraggable) {
+            this.activeDraggable.keyPress(event);
+        }
+    },
+
+    notify: function (eventName, draggable, event) {
+        MochiKit.Signal.signal(this, eventName, draggable, event);
+    }
+};
+
+/** @id MochiKit.DragAndDrop.Draggable */
+MochiKit.DragAndDrop.Draggable = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.DragAndDrop.Draggable.prototype = {
+    /***
+
+    A draggable object. Simple instantiate :
+
+        new MochiKit.DragAndDrop.Draggable('myelement');
+
+    ***/
+    __class__ : MochiKit.DragAndDrop.Draggable,
+
+    __init__: function (element, /* optional */options) {
+        var v = MochiKit.Visual;
+        var b = MochiKit.Base;
+        options = b.update({
+
+            /** @id MochiKit.DragAndDrop.handle */
+            handle: false,
+
+            /** @id MochiKit.DragAndDrop.starteffect */
+            starteffect: function (innerelement) {
+                this._savedOpacity = MochiKit.Style.getStyle(innerelement, 'opacity') || 1.0;
+                new v.Opacity(innerelement, {duration:0.2, from:this._savedOpacity, to:0.7});
+            },
+            /** @id MochiKit.DragAndDrop.reverteffect */
+            reverteffect: function (innerelement, top_offset, left_offset) {
+                var dur = Math.sqrt(Math.abs(top_offset^2) +
+                          Math.abs(left_offset^2))*0.02;
+                return new v.Move(innerelement,
+                            {x: -left_offset, y: -top_offset, duration: dur});
+            },
+
+            /** @id MochiKit.DragAndDrop.endeffect */
+            endeffect: function (innerelement) {
+                new v.Opacity(innerelement, {duration:0.2, from:0.7, to:this._savedOpacity});
+            },
+
+            /** @id MochiKit.DragAndDrop.onchange */
+            onchange: b.noop,
+
+            /** @id MochiKit.DragAndDrop.zindex */
+            zindex: 1000,
+
+            /** @id MochiKit.DragAndDrop.revert */
+            revert: false,
+
+            /** @id MochiKit.DragAndDrop.scroll */
+            scroll: false,
+
+            /** @id MochiKit.DragAndDrop.scrollSensitivity */
+            scrollSensitivity: 20,
+
+            /** @id MochiKit.DragAndDrop.scrollSpeed */
+            scrollSpeed: 15,
+            // false, or xy or [x, y] or function (x, y){return [x, y];}
+
+            /** @id MochiKit.DragAndDrop.snap */
+            snap: false
+        }, options);
+
+        var d = MochiKit.DOM;
+        this.element = d.getElement(element);
+
+        if (options.handle && (typeof(options.handle) == 'string')) {
+            this.handle = d.getFirstElementByTagAndClassName(null,
+                                       options.handle, this.element);
+        }
+        if (!this.handle) {
+            this.handle = d.getElement(options.handle);
+        }
+        if (!this.handle) {
+            this.handle = this.element;
+        }
+
+        if (options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+            options.scroll = d.getElement(options.scroll);
+            this._isScrollChild = MochiKit.DOM.isChildNode(this.element, options.scroll);
+        }
+
+        d.makePositioned(this.element);  // fix IE
+
+        this.delta = this.currentDelta();
+        this.options = options;
+        this.dragging = false;
+
+        this.eventMouseDown = MochiKit.Signal.connect(this.handle,
+                              'onmousedown', this, this.initDrag);
+        MochiKit.DragAndDrop.Draggables.register(this);
+    },
+
+    /** @id MochiKit.DragAndDrop.destroy */
+    destroy: function () {
+        MochiKit.Signal.disconnect(this.eventMouseDown);
+        MochiKit.DragAndDrop.Draggables.unregister(this);
+    },
+
+    /** @id MochiKit.DragAndDrop.currentDelta */
+    currentDelta: function () {
+        var s = MochiKit.Style.getStyle;
+        return [
+          parseInt(s(this.element, 'left') || '0'),
+          parseInt(s(this.element, 'top') || '0')];
+    },
+
+    /** @id MochiKit.DragAndDrop.initDrag */
+    initDrag: function (event) {
+        if (!event.mouse().button.left) {
+            return;
+        }
+        // abort on form elements, fixes a Firefox issue
+        var src = event.target();
+        var tagName = (src.tagName || '').toUpperCase();
+        if (tagName === 'INPUT' || tagName === 'SELECT' ||
+            tagName === 'OPTION' || tagName === 'BUTTON' ||
+            tagName === 'TEXTAREA') {
+            return;
+        }
+
+        if (this._revert) {
+            this._revert.cancel();
+            this._revert = null;
+        }
+
+        var pointer = event.mouse();
+        var pos = MochiKit.Position.cumulativeOffset(this.element);
+        this.offset = [pointer.page.x - pos.x, pointer.page.y - pos.y];
+
+        MochiKit.DragAndDrop.Draggables.activate(this);
+        event.stop();
+    },
+
+    /** @id MochiKit.DragAndDrop.startDrag */
+    startDrag: function (event) {
+        this.dragging = true;
+        if (this.options.selectclass) {
+            MochiKit.DOM.addElementClass(this.element,
+                                         this.options.selectclass);
+        }
+        if (this.options.zindex) {
+            this.originalZ = parseInt(MochiKit.Style.getStyle(this.element,
+                                      'z-index') || '0');
+            this.element.style.zIndex = this.options.zindex;
+        }
+
+        if (this.options.ghosting) {
+            this._clone = this.element.cloneNode(true);
+            this.ghostPosition = MochiKit.Position.absolutize(this.element);
+            this.element.parentNode.insertBefore(this._clone, this.element);
+        }
+
+        if (this.options.scroll) {
+            if (this.options.scroll == window) {
+                var where = this._getWindowScroll(this.options.scroll);
+                this.originalScrollLeft = where.left;
+                this.originalScrollTop = where.top;
+            } else {
+                this.originalScrollLeft = this.options.scroll.scrollLeft;
+                this.originalScrollTop = this.options.scroll.scrollTop;
+            }
+        }
+
+        MochiKit.DragAndDrop.Droppables.prepare(this.element);
+        MochiKit.DragAndDrop.Draggables.notify('start', this, event);
+        if (this.options.starteffect) {
+            this.options.starteffect(this.element);
+        }
+    },
+
+    /** @id MochiKit.DragAndDrop.updateDrag */
+    updateDrag: function (event, pointer) {
+        if (!this.dragging) {
+            this.startDrag(event);
+        }
+        MochiKit.Position.prepare();
+        MochiKit.DragAndDrop.Droppables.show(pointer, this.element);
+        MochiKit.DragAndDrop.Draggables.notify('drag', this, event);
+        this.draw(pointer);
+        this.options.onchange(this);
+
+        if (this.options.scroll) {
+            this.stopScrolling();
+            var p, q;
+            if (this.options.scroll == window) {
+                var s = this._getWindowScroll(this.options.scroll);
+                p = new MochiKit.Style.Coordinates(s.left, s.top);
+                q = new MochiKit.Style.Coordinates(s.left + s.width,
+                                                   s.top + s.height);
+            } else {
+                p = MochiKit.Position.page(this.options.scroll);
+                p.x += this.options.scroll.scrollLeft;
+                p.y += this.options.scroll.scrollTop;
+                p.x += (window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0);
+                p.y += (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0);
+                q = new MochiKit.Style.Coordinates(p.x + this.options.scroll.offsetWidth,
+                                                   p.y + this.options.scroll.offsetHeight);
+            }
+            var speed = [0, 0];
+            if (pointer.page.x > (q.x - this.options.scrollSensitivity)) {
+                speed[0] = pointer.page.x - (q.x - this.options.scrollSensitivity);
+            } else if (pointer.page.x < (p.x + this.options.scrollSensitivity)) {
+                speed[0] = pointer.page.x - (p.x + this.options.scrollSensitivity);
+            }
+            if (pointer.page.y > (q.y - this.options.scrollSensitivity)) {
+                speed[1] = pointer.page.y - (q.y - this.options.scrollSensitivity);
+            } else if (pointer.page.y < (p.y + this.options.scrollSensitivity)) {
+                speed[1] = pointer.page.y - (p.y + this.options.scrollSensitivity);
+            }
+            this.startScrolling(speed);
+        }
+
+        // fix AppleWebKit rendering
+        if (/AppleWebKit'/.test(navigator.appVersion)) {
+            window.scrollBy(0, 0);
+        }
+        event.stop();
+    },
+
+    /** @id MochiKit.DragAndDrop.finishDrag */
+    finishDrag: function (event, success) {
+        var dr = MochiKit.DragAndDrop;
+        this.dragging = false;
+        if (this.options.selectclass) {
+            MochiKit.DOM.removeElementClass(this.element,
+                                            this.options.selectclass);
+        }
+
+        if (this.options.ghosting) {
+            // XXX: from a user point of view, it would be better to remove
+            // the node only *after* the MochiKit.Visual.Move end when used
+            // with revert.
+            MochiKit.Position.relativize(this.element, this.ghostPosition);
+            MochiKit.DOM.removeElement(this._clone);
+            this._clone = null;
+        }
+
+        if (success) {
+            dr.Droppables.fire(event, this.element);
+        }
+        dr.Draggables.notify('end', this, event);
+
+        var revert = this.options.revert;
+        if (revert && typeof(revert) == 'function') {
+            revert = revert(this.element);
+        }
+
+        var d = this.currentDelta();
+        if (revert && this.options.reverteffect) {
+            this._revert = this.options.reverteffect(this.element,
+                d[1] - this.delta[1], d[0] - this.delta[0]);
+        } else {
+            this.delta = d;
+        }
+
+        if (this.options.zindex) {
+            this.element.style.zIndex = this.originalZ;
+        }
+
+        if (this.options.endeffect) {
+            this.options.endeffect(this.element);
+        }
+
+        dr.Draggables.deactivate();
+        dr.Droppables.reset(this.element);
+    },
+
+    /** @id MochiKit.DragAndDrop.keyPress */
+    keyPress: function (event) {
+        if (event.key().string != "KEY_ESCAPE") {
+            return;
+        }
+        this.finishDrag(event, false);
+        event.stop();
+    },
+
+    /** @id MochiKit.DragAndDrop.endDrag */
+    endDrag: function (event) {
+        if (!this.dragging) {
+            return;
+        }
+        this.stopScrolling();
+        this.finishDrag(event, true);
+        event.stop();
+    },
+
+    /** @id MochiKit.DragAndDrop.draw */
+    draw: function (point) {
+        var pos = MochiKit.Position.cumulativeOffset(this.element);
+        var d = this.currentDelta();
+        pos.x -= d[0];
+        pos.y -= d[1];
+
+        if (this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+            pos.x -= this.options.scroll.scrollLeft - this.originalScrollLeft;
+            pos.y -= this.options.scroll.scrollTop - this.originalScrollTop;
+        }
+
+        var p = [point.page.x - pos.x - this.offset[0],
+                 point.page.y - pos.y - this.offset[1]];
+
+        if (this.options.snap) {
+            if (typeof(this.options.snap) == 'function') {
+                p = this.options.snap(p[0], p[1]);
+            } else {
+                if (this.options.snap instanceof Array) {
+                    var i = -1;
+                    p = MochiKit.Base.map(MochiKit.Base.bind(function (v) {
+                            i += 1;
+                            return Math.round(v/this.options.snap[i]) *
+                                   this.options.snap[i];
+                        }, this), p);
+                } else {
+                    p = MochiKit.Base.map(MochiKit.Base.bind(function (v) {
+                        return Math.round(v/this.options.snap) *
+                               this.options.snap;
+                        }, this), p);
+                }
+            }
+        }
+        var style = this.element.style;
+        if ((!this.options.constraint) ||
+            (this.options.constraint == 'horizontal')) {
+            style.left = p[0] + 'px';
+        }
+        if ((!this.options.constraint) ||
+            (this.options.constraint == 'vertical')) {
+            style.top = p[1] + 'px';
+        }
+        if (style.visibility == 'hidden') {
+            style.visibility = '';  // fix gecko rendering
+        }
+    },
+
+    /** @id MochiKit.DragAndDrop.stopScrolling */
+    stopScrolling: function () {
+        if (this.scrollInterval) {
+            clearInterval(this.scrollInterval);
+            this.scrollInterval = null;
+            MochiKit.DragAndDrop.Draggables._lastScrollPointer = null;
+        }
+    },
+
+    /** @id MochiKit.DragAndDrop.startScrolling */
+    startScrolling: function (speed) {
+        if (!speed[0] && !speed[1]) {
+            return;
+        }
+        this.scrollSpeed = [speed[0] * this.options.scrollSpeed,
+                            speed[1] * this.options.scrollSpeed];
+        this.lastScrolled = new Date();
+        this.scrollInterval = setInterval(MochiKit.Base.bind(this.scroll, this), 10);
+    },
+
+    /** @id MochiKit.DragAndDrop.scroll */
+    scroll: function () {
+        var current = new Date();
+        var delta = current - this.lastScrolled;
+        this.lastScrolled = current;
+
+        if (this.options.scroll == window) {
+            var s = this._getWindowScroll(this.options.scroll);
+            if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+                var dm = delta / 1000;
+                this.options.scroll.scrollTo(s.left + dm * this.scrollSpeed[0],
+                                             s.top + dm * this.scrollSpeed[1]);
+            }
+        } else {
+            this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+            this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000;
+        }
+
+        var d = MochiKit.DragAndDrop;
+
+        MochiKit.Position.prepare();
+        d.Droppables.show(d.Draggables._lastPointer, this.element);
+        d.Draggables.notify('drag', this);
+        if (this._isScrollChild) {
+            d.Draggables._lastScrollPointer = d.Draggables._lastScrollPointer || d.Draggables._lastPointer;
+            d.Draggables._lastScrollPointer.x += this.scrollSpeed[0] * delta / 1000;
+            d.Draggables._lastScrollPointer.y += this.scrollSpeed[1] * delta / 1000;
+            if (d.Draggables._lastScrollPointer.x < 0) {
+                d.Draggables._lastScrollPointer.x = 0;
+            }
+            if (d.Draggables._lastScrollPointer.y < 0) {
+                d.Draggables._lastScrollPointer.y = 0;
+            }
+            this.draw(d.Draggables._lastScrollPointer);
+        }
+
+        this.options.onchange(this);
+    },
+
+    _getWindowScroll: function (win) {
+        var vp, w, h;
+        MochiKit.DOM.withWindow(win, function () {
+            vp = MochiKit.Style.getViewportPosition(win.document);
+        });
+        if (win.innerWidth) {
+            w = win.innerWidth;
+            h = win.innerHeight;
+        } else if (win.document.documentElement && win.document.documentElement.clientWidth) {
+            w = win.document.documentElement.clientWidth;
+            h = win.document.documentElement.clientHeight;
+        } else {
+            w = win.document.body.offsetWidth;
+            h = win.document.body.offsetHeight;
+        }
+        return {top: vp.x, left: vp.y, width: w, height: h};
+    },
+
+    /** @id MochiKit.DragAndDrop.repr */
+    repr: function () {
+        return '[' + this.__class__.NAME + ", options:" + MochiKit.Base.repr(this.options) + "]";
+    }
+};
+
+MochiKit.DragAndDrop.__new__ = function () {
+    MochiKit.Base.nameFunctions(this);
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": MochiKit.Base.concat(this.EXPORT, this.EXPORT_OK)
+    };
+};
+
+MochiKit.DragAndDrop.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.DragAndDrop);
+
diff --git a/IPython/external/external/MochiKit/Format.js b/IPython/external/external/MochiKit/Format.js
new file mode 100644
index 0000000..243bf0d
--- /dev/null
+++ b/IPython/external/external/MochiKit/Format.js
@@ -0,0 +1,305 @@
+/***
+
+MochiKit.Format 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Format');
+}
+
+if (typeof(MochiKit) == 'undefined') {
+    MochiKit = {};
+}
+
+if (typeof(MochiKit.Format) == 'undefined') {
+    MochiKit.Format = {};
+}
+
+MochiKit.Format.NAME = "MochiKit.Format";
+MochiKit.Format.VERSION = "1.4";
+MochiKit.Format.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+MochiKit.Format.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Format._numberFormatter = function (placeholder, header, footer, locale, isPercent, precision, leadingZeros, separatorAt, trailingZeros) {
+    return function (num) {
+        num = parseFloat(num);
+        if (typeof(num) == "undefined" || num === null || isNaN(num)) {
+            return placeholder;
+        }
+        var curheader = header;
+        var curfooter = footer;
+        if (num < 0) {
+            num = -num;
+        } else {
+            curheader = curheader.replace(/-/, "");
+        }
+        var me = arguments.callee;
+        var fmt = MochiKit.Format.formatLocale(locale);
+        if (isPercent) {
+            num = num * 100.0;
+            curfooter = fmt.percent + curfooter;
+        }
+        num = MochiKit.Format.roundToFixed(num, precision);
+        var parts = num.split(/\./);
+        var whole = parts[0];
+        var frac = (parts.length == 1) ? "" : parts[1];
+        var res = "";
+        while (whole.length < leadingZeros) {
+            whole = "0" + whole;
+        }
+        if (separatorAt) {
+            while (whole.length > separatorAt) {
+                var i = whole.length - separatorAt;
+                //res = res + fmt.separator + whole.substring(i, whole.length);
+                res = fmt.separator + whole.substring(i, whole.length) + res;
+                whole = whole.substring(0, i);
+            }
+        }
+        res = whole + res;
+        if (precision > 0) {
+            while (frac.length < trailingZeros) {
+                frac = frac + "0";
+            }
+            res = res + fmt.decimal + frac;
+        }
+        return curheader + res + curfooter;
+    };
+};
+
+/** @id MochiKit.Format.numberFormatter */
+MochiKit.Format.numberFormatter = function (pattern, placeholder/* = "" */, locale/* = "default" */) {
+    // http://java.sun.com/docs/books/tutorial/i18n/format/numberpattern.html
+    // | 0 | leading or trailing zeros
+    // | # | just the number
+    // | , | separator
+    // | . | decimal separator
+    // | % | Multiply by 100 and format as percent
+    if (typeof(placeholder) == "undefined") {
+        placeholder = "";
+    }
+    var match = pattern.match(/((?:[0#]+,)?[0#]+)(?:\.([0#]+))?(%)?/);
+    if (!match) {
+        throw TypeError("Invalid pattern");
+    }
+    var header = pattern.substr(0, match.index);
+    var footer = pattern.substr(match.index + match[0].length);
+    if (header.search(/-/) == -1) {
+        header = header + "-";
+    }
+    var whole = match[1];
+    var frac = (typeof(match[2]) == "string" && match[2] != "") ? match[2] : "";
+    var isPercent = (typeof(match[3]) == "string" && match[3] != "");
+    var tmp = whole.split(/,/);
+    var separatorAt;
+    if (typeof(locale) == "undefined") {
+        locale = "default";
+    }
+    if (tmp.length == 1) {
+        separatorAt = null;
+    } else {
+        separatorAt = tmp[1].length;
+    }
+    var leadingZeros = whole.length - whole.replace(/0/g, "").length;
+    var trailingZeros = frac.length - frac.replace(/0/g, "").length;
+    var precision = frac.length;
+    var rval = MochiKit.Format._numberFormatter(
+        placeholder, header, footer, locale, isPercent, precision,
+        leadingZeros, separatorAt, trailingZeros
+    );
+    var m = MochiKit.Base;
+    if (m) {
+        var fn = arguments.callee;
+        var args = m.concat(arguments);
+        rval.repr = function () {
+            return [
+                self.NAME,
+                "(",
+                map(m.repr, args).join(", "),
+                ")"
+            ].join("");
+        };
+    }
+    return rval;
+};
+
+/** @id MochiKit.Format.formatLocale */
+MochiKit.Format.formatLocale = function (locale) {
+    if (typeof(locale) == "undefined" || locale === null) {
+        locale = "default";
+    }
+    if (typeof(locale) == "string") {
+        var rval = MochiKit.Format.LOCALE[locale];
+        if (typeof(rval) == "string") {
+            rval = arguments.callee(rval);
+            MochiKit.Format.LOCALE[locale] = rval;
+        }
+        return rval;
+    } else {
+        return locale;
+    }
+};
+
+/** @id MochiKit.Format.twoDigitAverage */
+MochiKit.Format.twoDigitAverage = function (numerator, denominator) {
+    if (denominator) {
+        var res = numerator / denominator;
+        if (!isNaN(res)) {
+            return MochiKit.Format.twoDigitFloat(numerator / denominator);
+        }
+    }
+    return "0";
+};
+
+/** @id MochiKit.Format.twoDigitFloat */
+MochiKit.Format.twoDigitFloat = function (someFloat) {
+    var sign = (someFloat < 0 ? '-' : '');
+    var s = Math.floor(Math.abs(someFloat) * 100).toString();
+    if (s == '0') {
+        return s;
+    }
+    if (s.length < 3) {
+        while (s.charAt(s.length - 1) == '0') {
+            s = s.substring(0, s.length - 1);
+        }
+        return sign + '0.' + s;
+    }
+    var head = sign + s.substring(0, s.length - 2);
+    var tail = s.substring(s.length - 2, s.length);
+    if (tail == '00') {
+        return head;
+    } else if (tail.charAt(1) == '0') {
+        return head + '.' + tail.charAt(0);
+    } else {
+        return head + '.' + tail;
+    }
+};
+
+/** @id MochiKit.Format.lstrip */
+MochiKit.Format.lstrip = function (str, /* optional */chars) {
+    str = str + "";
+    if (typeof(str) != "string") {
+        return null;
+    }
+    if (!chars) {
+        return str.replace(/^\s+/, "");
+    } else {
+        return str.replace(new RegExp("^[" + chars + "]+"), "");
+    }
+};
+
+/** @id MochiKit.Format.rstrip */
+MochiKit.Format.rstrip = function (str, /* optional */chars) {
+    str = str + "";
+    if (typeof(str) != "string") {
+        return null;
+    }
+    if (!chars) {
+        return str.replace(/\s+$/, "");
+    } else {
+        return str.replace(new RegExp("[" + chars + "]+$"), "");
+    }
+};
+
+/** @id MochiKit.Format.strip */
+MochiKit.Format.strip = function (str, /* optional */chars) {
+    var self = MochiKit.Format;
+    return self.rstrip(self.lstrip(str, chars), chars);
+};
+
+/** @id MochiKit.Format.truncToFixed */
+MochiKit.Format.truncToFixed = function (aNumber, precision) {
+    aNumber = Math.floor(aNumber * Math.pow(10, precision));
+    var res = (aNumber * Math.pow(10, -precision)).toFixed(precision);
+    if (res.charAt(0) == ".") {
+        res = "0" + res;
+    }
+    return res;
+};
+
+/** @id MochiKit.Format.roundToFixed */
+MochiKit.Format.roundToFixed = function (aNumber, precision) {
+    return MochiKit.Format.truncToFixed(
+        aNumber + 0.5 * Math.pow(10, -precision),
+        precision
+    );
+};
+
+/** @id MochiKit.Format.percentFormat */
+MochiKit.Format.percentFormat = function (someFloat) {
+    return MochiKit.Format.twoDigitFloat(100 * someFloat) + '%';
+};
+
+MochiKit.Format.EXPORT = [
+    "truncToFixed",
+    "roundToFixed",
+    "numberFormatter",
+    "formatLocale",
+    "twoDigitAverage",
+    "twoDigitFloat",
+    "percentFormat",
+    "lstrip",
+    "rstrip",
+    "strip"
+];
+
+MochiKit.Format.LOCALE = {
+    en_US: {separator: ",", decimal: ".", percent: "%"},
+    de_DE: {separator: ".", decimal: ",", percent: "%"},
+    pt_BR: {separator: ".", decimal: ",", percent: "%"},
+    fr_FR: {separator: " ", decimal: ",", percent: "%"},
+    "default": "en_US"
+};
+
+MochiKit.Format.EXPORT_OK = [];
+MochiKit.Format.EXPORT_TAGS = {
+    ':all': MochiKit.Format.EXPORT,
+    ':common': MochiKit.Format.EXPORT
+};
+
+MochiKit.Format.__new__ = function () {
+    // MochiKit.Base.nameFunctions(this);
+    var base = this.NAME + ".";
+    var k, v, o;
+    for (k in this.LOCALE) {
+        o = this.LOCALE[k];
+        if (typeof(o) == "object") {
+            o.repr = function () { return this.NAME; };
+            o.NAME = base + "LOCALE." + k;
+        }
+    }
+    for (k in this) {
+        o = this[k];
+        if (typeof(o) == 'function' && typeof(o.NAME) == 'undefined') {
+            try {
+                o.NAME = base + k;
+            } catch (e) {
+                // pass
+            }
+        }
+    }
+};
+
+MochiKit.Format.__new__();
+
+if (typeof(MochiKit.Base) != "undefined") {
+    MochiKit.Base._exportSymbols(this, MochiKit.Format);
+} else {
+    (function (globals, module) {
+        if ((typeof(JSAN) == 'undefined' && typeof(dojo) == 'undefined')
+            || (MochiKit.__export__ === false)) {
+            var all = module.EXPORT_TAGS[":all"];
+            for (var i = 0; i < all.length; i++) {
+                globals[all[i]] = module[all[i]];
+            }
+        }
+    })(this, MochiKit.Format);
+}
diff --git a/IPython/external/external/MochiKit/Iter.js b/IPython/external/external/MochiKit/Iter.js
new file mode 100644
index 0000000..3b8e095
--- /dev/null
+++ b/IPython/external/external/MochiKit/Iter.js
@@ -0,0 +1,851 @@
+/***
+
+MochiKit.Iter 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Iter');
+    dojo.require('MochiKit.Base');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Iter depends on MochiKit.Base!";
+}
+
+if (typeof(MochiKit.Iter) == 'undefined') {
+    MochiKit.Iter = {};
+}
+
+MochiKit.Iter.NAME = "MochiKit.Iter";
+MochiKit.Iter.VERSION = "1.4";
+MochiKit.Base.update(MochiKit.Iter, {
+    __repr__: function () {
+        return "[" + this.NAME + " " + this.VERSION + "]";
+    },
+    toString: function () {
+        return this.__repr__();
+    },
+
+    /** @id MochiKit.Iter.registerIteratorFactory  */
+    registerIteratorFactory: function (name, check, iterfactory, /* optional */ override) {
+        MochiKit.Iter.iteratorRegistry.register(name, check, iterfactory, override);
+    },
+
+    /** @id MochiKit.Iter.iter */
+    iter: function (iterable, /* optional */ sentinel) {
+        var self = MochiKit.Iter;
+        if (arguments.length == 2) {
+            return self.takewhile(
+                function (a) { return a != sentinel; },
+                iterable
+            );
+        }
+        if (typeof(iterable.next) == 'function') {
+            return iterable;
+        } else if (typeof(iterable.iter) == 'function') {
+            return iterable.iter();
+        /*
+        }  else if (typeof(iterable.__iterator__) == 'function') {
+            //
+            // XXX: We can't support JavaScript 1.7 __iterator__ directly
+            //      because of Object.prototype.__iterator__
+            //
+            return iterable.__iterator__();
+        */
+        }
+
+        try {
+            return self.iteratorRegistry.match(iterable);
+        } catch (e) {
+            var m = MochiKit.Base;
+            if (e == m.NotFound) {
+                e = new TypeError(typeof(iterable) + ": " + m.repr(iterable) + " is not iterable");
+            }
+            throw e;
+        }
+    },
+
+    /** @id MochiKit.Iter.count */
+    count: function (n) {
+        if (!n) {
+            n = 0;
+        }
+        var m = MochiKit.Base;
+        return {
+            repr: function () { return "count(" + n + ")"; },
+            toString: m.forwardCall("repr"),
+            next: m.counter(n)
+        };
+    },
+
+    /** @id MochiKit.Iter.cycle */
+    cycle: function (p) {
+        var self = MochiKit.Iter;
+        var m = MochiKit.Base;
+        var lst = [];
+        var iterator = self.iter(p);
+        return {
+            repr: function () { return "cycle(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                try {
+                    var rval = iterator.next();
+                    lst.push(rval);
+                    return rval;
+                } catch (e) {
+                    if (e != self.StopIteration) {
+                        throw e;
+                    }
+                    if (lst.length === 0) {
+                        this.next = function () {
+                            throw self.StopIteration;
+                        };
+                    } else {
+                        var i = -1;
+                        this.next = function () {
+                            i = (i + 1) % lst.length;
+                            return lst[i];
+                        };
+                    }
+                    return this.next();
+                }
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.repeat */
+    repeat: function (elem, /* optional */n) {
+        var m = MochiKit.Base;
+        if (typeof(n) == 'undefined') {
+            return {
+                repr: function () {
+                    return "repeat(" + m.repr(elem) + ")";
+                },
+                toString: m.forwardCall("repr"),
+                next: function () {
+                    return elem;
+                }
+            };
+        }
+        return {
+            repr: function () {
+                return "repeat(" + m.repr(elem) + ", " + n + ")";
+            },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                if (n <= 0) {
+                    throw MochiKit.Iter.StopIteration;
+                }
+                n -= 1;
+                return elem;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.next */
+    next: function (iterator) {
+        return iterator.next();
+    },
+
+    /** @id MochiKit.Iter.izip */
+    izip: function (p, q/*, ...*/) {
+        var m = MochiKit.Base;
+        var self = MochiKit.Iter;
+        var next = self.next;
+        var iterables = m.map(self.iter, arguments);
+        return {
+            repr: function () { return "izip(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () { return m.map(next, iterables); }
+        };
+    },
+
+    /** @id MochiKit.Iter.ifilter */
+    ifilter: function (pred, seq) {
+        var m = MochiKit.Base;
+        seq = MochiKit.Iter.iter(seq);
+        if (pred === null) {
+            pred = m.operator.truth;
+        }
+        return {
+            repr: function () { return "ifilter(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                while (true) {
+                    var rval = seq.next();
+                    if (pred(rval)) {
+                        return rval;
+                    }
+                }
+                // mozilla warnings aren't too bright
+                return undefined;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.ifilterfalse */
+    ifilterfalse: function (pred, seq) {
+        var m = MochiKit.Base;
+        seq = MochiKit.Iter.iter(seq);
+        if (pred === null) {
+            pred = m.operator.truth;
+        }
+        return {
+            repr: function () { return "ifilterfalse(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                while (true) {
+                    var rval = seq.next();
+                    if (!pred(rval)) {
+                        return rval;
+                    }
+                }
+                // mozilla warnings aren't too bright
+                return undefined;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.islice */
+    islice: function (seq/*, [start,] stop[, step] */) {
+        var self = MochiKit.Iter;
+        var m = MochiKit.Base;
+        seq = self.iter(seq);
+        var start = 0;
+        var stop = 0;
+        var step = 1;
+        var i = -1;
+        if (arguments.length == 2) {
+            stop = arguments[1];
+        } else if (arguments.length == 3) {
+            start = arguments[1];
+            stop = arguments[2];
+        } else {
+            start = arguments[1];
+            stop = arguments[2];
+            step = arguments[3];
+        }
+        return {
+            repr: function () {
+                return "islice(" + ["...", start, stop, step].join(", ") + ")";
+            },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                var rval;
+                while (i < start) {
+                    rval = seq.next();
+                    i++;
+                }
+                if (start >= stop) {
+                    throw self.StopIteration;
+                }
+                start += step;
+                return rval;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.imap */
+    imap: function (fun, p, q/*, ...*/) {
+        var m = MochiKit.Base;
+        var self = MochiKit.Iter;
+        var iterables = m.map(self.iter, m.extend(null, arguments, 1));
+        var map = m.map;
+        var next = self.next;
+        return {
+            repr: function () { return "imap(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                return fun.apply(this, map(next, iterables));
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.applymap */
+    applymap: function (fun, seq, self) {
+        seq = MochiKit.Iter.iter(seq);
+        var m = MochiKit.Base;
+        return {
+            repr: function () { return "applymap(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                return fun.apply(self, seq.next());
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.chain */
+    chain: function (p, q/*, ...*/) {
+        // dumb fast path
+        var self = MochiKit.Iter;
+        var m = MochiKit.Base;
+        if (arguments.length == 1) {
+            return self.iter(arguments[0]);
+        }
+        var argiter = m.map(self.iter, arguments);
+        return {
+            repr: function () { return "chain(...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                while (argiter.length > 1) {
+                    try {
+                        return argiter[0].next();
+                    } catch (e) {
+                        if (e != self.StopIteration) {
+                            throw e;
+                        }
+                        argiter.shift();
+                    }
+                }
+                if (argiter.length == 1) {
+                    // optimize last element
+                    var arg = argiter.shift();
+                    this.next = m.bind("next", arg);
+                    return this.next();
+                }
+                throw self.StopIteration;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.takewhile */
+    takewhile: function (pred, seq) {
+        var self = MochiKit.Iter;
+        seq = self.iter(seq);
+        return {
+            repr: function () { return "takewhile(...)"; },
+            toString: MochiKit.Base.forwardCall("repr"),
+            next: function () {
+                var rval = seq.next();
+                if (!pred(rval)) {
+                    this.next = function () {
+                        throw self.StopIteration;
+                    };
+                    this.next();
+                }
+                return rval;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.dropwhile */
+    dropwhile: function (pred, seq) {
+        seq = MochiKit.Iter.iter(seq);
+        var m = MochiKit.Base;
+        var bind = m.bind;
+        return {
+            "repr": function () { return "dropwhile(...)"; },
+            "toString": m.forwardCall("repr"),
+            "next": function () {
+                while (true) {
+                    var rval = seq.next();
+                    if (!pred(rval)) {
+                        break;
+                    }
+                }
+                this.next = bind("next", seq);
+                return rval;
+            }
+        };
+    },
+
+    _tee: function (ident, sync, iterable) {
+        sync.pos[ident] = -1;
+        var m = MochiKit.Base;
+        var listMin = m.listMin;
+        return {
+            repr: function () { return "tee(" + ident + ", ...)"; },
+            toString: m.forwardCall("repr"),
+            next: function () {
+                var rval;
+                var i = sync.pos[ident];
+
+                if (i == sync.max) {
+                    rval = iterable.next();
+                    sync.deque.push(rval);
+                    sync.max += 1;
+                    sync.pos[ident] += 1;
+                } else {
+                    rval = sync.deque[i - sync.min];
+                    sync.pos[ident] += 1;
+                    if (i == sync.min && listMin(sync.pos) != sync.min) {
+                        sync.min += 1;
+                        sync.deque.shift();
+                    }
+                }
+                return rval;
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.tee */
+    tee: function (iterable, n/* = 2 */) {
+        var rval = [];
+        var sync = {
+            "pos": [],
+            "deque": [],
+            "max": -1,
+            "min": -1
+        };
+        if (arguments.length == 1 || typeof(n) == "undefined" || n === null) {
+            n = 2;
+        }
+        var self = MochiKit.Iter;
+        iterable = self.iter(iterable);
+        var _tee = self._tee;
+        for (var i = 0; i < n; i++) {
+            rval.push(_tee(i, sync, iterable));
+        }
+        return rval;
+    },
+
+    /** @id MochiKit.Iter.list */
+    list: function (iterable) {
+        // Fast-path for Array and Array-like
+        var rval;
+        if (iterable instanceof Array) {
+            return iterable.slice();
+        } 
+        // this is necessary to avoid a Safari crash
+        if (typeof(iterable) == "function" &&
+                !(iterable instanceof Function) &&
+                typeof(iterable.length) == 'number') {
+            rval = [];
+            for (var i = 0; i < iterable.length; i++) {
+                rval.push(iterable[i]);
+            }
+            return rval;
+        }
+
+        var self = MochiKit.Iter;
+        iterable = self.iter(iterable);
+        var rval = [];
+        try {
+            while (true) {
+                rval.push(iterable.next());
+            }
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+            return rval;
+        }
+        // mozilla warnings aren't too bright
+        return undefined;
+    },
+
+
+    /** @id MochiKit.Iter.reduce */
+    reduce: function (fn, iterable, /* optional */initial) {
+        var i = 0;
+        var x = initial;
+        var self = MochiKit.Iter;
+        iterable = self.iter(iterable);
+        if (arguments.length < 3) {
+            try {
+                x = iterable.next();
+            } catch (e) {
+                if (e == self.StopIteration) {
+                    e = new TypeError("reduce() of empty sequence with no initial value");
+                }
+                throw e;
+            }
+            i++;
+        }
+        try {
+            while (true) {
+                x = fn(x, iterable.next());
+            }
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+        }
+        return x;
+    },
+
+    /** @id MochiKit.Iter.range */
+    range: function (/* [start,] stop[, step] */) {
+        var start = 0;
+        var stop = 0;
+        var step = 1;
+        if (arguments.length == 1) {
+            stop = arguments[0];
+        } else if (arguments.length == 2) {
+            start = arguments[0];
+            stop = arguments[1];
+        } else if (arguments.length == 3) {
+            start = arguments[0];
+            stop = arguments[1];
+            step = arguments[2];
+        } else {
+            throw new TypeError("range() takes 1, 2, or 3 arguments!");
+        }
+        if (step === 0) {
+            throw new TypeError("range() step must not be 0");
+        }
+        return {
+            next: function () {
+                if ((step > 0 && start >= stop) || (step < 0 && start <= stop)) {
+                    throw MochiKit.Iter.StopIteration;
+                }
+                var rval = start;
+                start += step;
+                return rval;
+            },
+            repr: function () {
+                return "range(" + [start, stop, step].join(", ") + ")";
+            },
+            toString: MochiKit.Base.forwardCall("repr")
+        };
+    },
+
+    /** @id MochiKit.Iter.sum */
+    sum: function (iterable, start/* = 0 */) {
+        if (typeof(start) == "undefined" || start === null) {
+            start = 0;
+        }
+        var x = start;
+        var self = MochiKit.Iter;
+        iterable = self.iter(iterable);
+        try {
+            while (true) {
+                x += iterable.next();
+            }
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+        }
+        return x;
+    },
+
+    /** @id MochiKit.Iter.exhaust */
+    exhaust: function (iterable) {
+        var self = MochiKit.Iter;
+        iterable = self.iter(iterable);
+        try {
+            while (true) {
+                iterable.next();
+            }
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+        }
+    },
+
+    /** @id MochiKit.Iter.forEach */
+    forEach: function (iterable, func, /* optional */self) {
+        var m = MochiKit.Base;
+        if (arguments.length > 2) {
+            func = m.bind(func, self);
+        }
+        // fast path for array
+        if (m.isArrayLike(iterable)) {
+            try {
+                for (var i = 0; i < iterable.length; i++) {
+                    func(iterable[i]);
+                }
+            } catch (e) {
+                if (e != MochiKit.Iter.StopIteration) {
+                    throw e;
+                }
+            }
+        } else {
+            self = MochiKit.Iter;
+            self.exhaust(self.imap(func, iterable));
+        }
+    },
+
+    /** @id MochiKit.Iter.every */
+    every: function (iterable, func) {
+        var self = MochiKit.Iter;
+        try {
+            self.ifilterfalse(func, iterable).next();
+            return false;
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+            return true;
+        }
+    },
+
+    /** @id MochiKit.Iter.sorted */
+    sorted: function (iterable, /* optional */cmp) {
+        var rval = MochiKit.Iter.list(iterable);
+        if (arguments.length == 1) {
+            cmp = MochiKit.Base.compare;
+        }
+        rval.sort(cmp);
+        return rval;
+    },
+
+    /** @id MochiKit.Iter.reversed */
+    reversed: function (iterable) {
+        var rval = MochiKit.Iter.list(iterable);
+        rval.reverse();
+        return rval;
+    },
+
+    /** @id MochiKit.Iter.some */
+    some: function (iterable, func) {
+        var self = MochiKit.Iter;
+        try {
+            self.ifilter(func, iterable).next();
+            return true;
+        } catch (e) {
+            if (e != self.StopIteration) {
+                throw e;
+            }
+            return false;
+        }
+    },
+
+    /** @id MochiKit.Iter.iextend */
+    iextend: function (lst, iterable) {
+        if (MochiKit.Base.isArrayLike(iterable)) {
+            // fast-path for array-like
+            for (var i = 0; i < iterable.length; i++) {
+                lst.push(iterable[i]);
+            }
+        } else {
+            var self = MochiKit.Iter;
+            iterable = self.iter(iterable);
+            try {
+                while (true) {
+                    lst.push(iterable.next());
+                }
+            } catch (e) {
+                if (e != self.StopIteration) {
+                    throw e;
+                }
+            }
+        }
+        return lst;
+    },
+
+    /** @id MochiKit.Iter.groupby */
+    groupby: function(iterable, /* optional */ keyfunc) {
+        var m = MochiKit.Base;
+        var self = MochiKit.Iter;
+        if (arguments.length < 2) {
+            keyfunc = m.operator.identity;
+        }
+        iterable = self.iter(iterable);
+
+        // shared
+        var pk = undefined;
+        var k = undefined;
+        var v;
+
+        function fetch() {
+            v = iterable.next();
+            k = keyfunc(v);
+        };
+
+        function eat() {
+            var ret = v;
+            v = undefined;
+            return ret;
+        };
+
+        var first = true;
+        var compare = m.compare;
+        return {
+            repr: function () { return "groupby(...)"; },
+            next: function() {
+                // iterator-next
+
+                // iterate until meet next group
+                while (compare(k, pk) === 0) {
+                    fetch();
+                    if (first) {
+                        first = false;
+                        break;
+                    }
+                }
+                pk = k;
+                return [k, {
+                    next: function() {
+                        // subiterator-next
+                        if (v == undefined) { // Is there something to eat?
+                            fetch();
+                        }
+                        if (compare(k, pk) !== 0) {
+                            throw self.StopIteration;
+                        }
+                        return eat();
+                    }
+                }];
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.groupby_as_array */
+    groupby_as_array: function (iterable, /* optional */ keyfunc) {
+        var m = MochiKit.Base;
+        var self = MochiKit.Iter;
+        if (arguments.length < 2) {
+            keyfunc = m.operator.identity;
+        }
+
+        iterable = self.iter(iterable);
+        var result = [];
+        var first = true;
+        var prev_key;
+        var compare = m.compare;
+        while (true) {
+            try {
+                var value = iterable.next();
+                var key = keyfunc(value);
+            } catch (e) {
+                if (e == self.StopIteration) {
+                    break;
+                }
+                throw e;
+            }
+            if (first || compare(key, prev_key) !== 0) {
+                var values = [];
+                result.push([key, values]);
+            }
+            values.push(value);
+            first = false;
+            prev_key = key;
+        }
+        return result;
+    },
+
+    /** @id MochiKit.Iter.arrayLikeIter */
+    arrayLikeIter: function (iterable) {
+        var i = 0;
+        return {
+            repr: function () { return "arrayLikeIter(...)"; },
+            toString: MochiKit.Base.forwardCall("repr"),
+            next: function () {
+                if (i >= iterable.length) {
+                    throw MochiKit.Iter.StopIteration;
+                }
+                return iterable[i++];
+            }
+        };
+    },
+
+    /** @id MochiKit.Iter.hasIterateNext */
+    hasIterateNext: function (iterable) {
+        return (iterable && typeof(iterable.iterateNext) == "function");
+    },
+
+    /** @id MochiKit.Iter.iterateNextIter */
+    iterateNextIter: function (iterable) {
+        return {
+            repr: function () { return "iterateNextIter(...)"; },
+            toString: MochiKit.Base.forwardCall("repr"),
+            next: function () {
+                var rval = iterable.iterateNext();
+                if (rval === null || rval === undefined) {
+                    throw MochiKit.Iter.StopIteration;
+                }
+                return rval;
+            }
+        };
+    }
+});
+
+
+MochiKit.Iter.EXPORT_OK = [
+    "iteratorRegistry",
+    "arrayLikeIter",
+    "hasIterateNext",
+    "iterateNextIter"
+];
+
+MochiKit.Iter.EXPORT = [
+    "StopIteration",
+    "registerIteratorFactory",
+    "iter",
+    "count",
+    "cycle",
+    "repeat",
+    "next",
+    "izip",
+    "ifilter",
+    "ifilterfalse",
+    "islice",
+    "imap",
+    "applymap",
+    "chain",
+    "takewhile",
+    "dropwhile",
+    "tee",
+    "list",
+    "reduce",
+    "range",
+    "sum",
+    "exhaust",
+    "forEach",
+    "every",
+    "sorted",
+    "reversed",
+    "some",
+    "iextend",
+    "groupby",
+    "groupby_as_array"
+];
+
+MochiKit.Iter.__new__ = function () {
+    var m = MochiKit.Base;
+    // Re-use StopIteration if exists (e.g. SpiderMonkey)
+    if (typeof(StopIteration) != "undefined") {
+        this.StopIteration = StopIteration;
+    } else {
+        /** @id MochiKit.Iter.StopIteration */
+        this.StopIteration = new m.NamedError("StopIteration");
+    }
+    this.iteratorRegistry = new m.AdapterRegistry();
+    // Register the iterator factory for arrays
+    this.registerIteratorFactory(
+        "arrayLike",
+        m.isArrayLike,
+        this.arrayLikeIter
+    );
+
+    this.registerIteratorFactory(
+        "iterateNext",
+        this.hasIterateNext,
+        this.iterateNextIter
+    );
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+
+};
+
+MochiKit.Iter.__new__();
+
+//
+// XXX: Internet Explorer blows
+//
+if (MochiKit.__export__) {
+    reduce = MochiKit.Iter.reduce;
+}
+
+MochiKit.Base._exportSymbols(this, MochiKit.Iter);
diff --git a/IPython/external/external/MochiKit/Logging.js b/IPython/external/external/MochiKit/Logging.js
new file mode 100644
index 0000000..4d25c3e
--- /dev/null
+++ b/IPython/external/external/MochiKit/Logging.js
@@ -0,0 +1,321 @@
+/***
+
+MochiKit.Logging 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Logging');
+    dojo.require('MochiKit.Base');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Logging depends on MochiKit.Base!";
+}
+
+if (typeof(MochiKit.Logging) == 'undefined') {
+    MochiKit.Logging = {};
+}
+
+MochiKit.Logging.NAME = "MochiKit.Logging";
+MochiKit.Logging.VERSION = "1.4";
+MochiKit.Logging.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.Logging.toString = function () {
+    return this.__repr__();
+};
+
+
+MochiKit.Logging.EXPORT = [
+    "LogLevel",
+    "LogMessage",
+    "Logger",
+    "alertListener",
+    "logger",
+    "log",
+    "logError",
+    "logDebug",
+    "logFatal",
+    "logWarning"
+];
+
+
+MochiKit.Logging.EXPORT_OK = [
+    "logLevelAtLeast",
+    "isLogMessage",
+    "compareLogMessage"
+];
+
+
+/** @id MochiKit.Logging.LogMessage */
+MochiKit.Logging.LogMessage = function (num, level, info) {
+    this.num = num;
+    this.level = level;
+    this.info = info;
+    this.timestamp = new Date();
+};
+
+MochiKit.Logging.LogMessage.prototype = {
+     /** @id MochiKit.Logging.LogMessage.prototype.repr */
+    repr: function () {
+        var m = MochiKit.Base;
+        return 'LogMessage(' +
+            m.map(
+                m.repr,
+                [this.num, this.level, this.info]
+            ).join(', ') + ')';
+    },
+    /** @id MochiKit.Logging.LogMessage.prototype.toString */
+    toString: MochiKit.Base.forwardCall("repr")
+};
+
+MochiKit.Base.update(MochiKit.Logging, {
+    /** @id MochiKit.Logging.logLevelAtLeast */
+    logLevelAtLeast: function (minLevel) {
+        var self = MochiKit.Logging;
+        if (typeof(minLevel) == 'string') {
+            minLevel = self.LogLevel[minLevel];
+        }
+        return function (msg) {
+            var msgLevel = msg.level;
+            if (typeof(msgLevel) == 'string') {
+                msgLevel = self.LogLevel[msgLevel];
+            }
+            return msgLevel >= minLevel;
+        };
+    },
+
+    /** @id MochiKit.Logging.isLogMessage */
+    isLogMessage: function (/* ... */) {
+        var LogMessage = MochiKit.Logging.LogMessage;
+        for (var i = 0; i < arguments.length; i++) {
+            if (!(arguments[i] instanceof LogMessage)) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /** @id MochiKit.Logging.compareLogMessage */
+    compareLogMessage: function (a, b) {
+        return MochiKit.Base.compare([a.level, a.info], [b.level, b.info]);
+    },
+
+    /** @id MochiKit.Logging.alertListener */
+    alertListener: function (msg) {
+        alert(
+            "num: " + msg.num +
+            "\nlevel: " +  msg.level +
+            "\ninfo: " + msg.info.join(" ")
+        );
+    }
+
+});
+
+/** @id MochiKit.Logging.Logger */
+MochiKit.Logging.Logger = function (/* optional */maxSize) {
+    this.counter = 0;
+    if (typeof(maxSize) == 'undefined' || maxSize === null) {
+        maxSize = -1;
+    }
+    this.maxSize = maxSize;
+    this._messages = [];
+    this.listeners = {};
+    this.useNativeConsole = false;
+};
+
+MochiKit.Logging.Logger.prototype = {
+    /** @id MochiKit.Logging.Logger.prototype.clear */
+    clear: function () {
+        this._messages.splice(0, this._messages.length);
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.logToConsole */
+    logToConsole: function (msg) {
+        if (typeof(window) != "undefined" && window.console
+                && window.console.log) {
+            // Safari and FireBug 0.4
+            // Percent replacement is a workaround for cute Safari crashing bug
+            window.console.log(msg.replace(/%/g, '\uFF05'));
+        } else if (typeof(opera) != "undefined" && opera.postError) {
+            // Opera
+            opera.postError(msg);
+        } else if (typeof(printfire) == "function") {
+            // FireBug 0.3 and earlier
+            printfire(msg);
+        } else if (typeof(Debug) != "undefined" && Debug.writeln) {
+            // IE Web Development Helper (?)
+            // http://www.nikhilk.net/Entry.aspx?id=93
+            Debug.writeln(msg);
+        } else if (typeof(debug) != "undefined" && debug.trace) {
+            // Atlas framework (?)
+            // http://www.nikhilk.net/Entry.aspx?id=93
+            debug.trace(msg);
+        }
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.dispatchListeners */
+    dispatchListeners: function (msg) {
+        for (var k in this.listeners) {
+            var pair = this.listeners[k];
+            if (pair.ident != k || (pair[0] && !pair[0](msg))) {
+                continue;
+            }
+            pair[1](msg);
+        }
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.addListener */
+    addListener: function (ident, filter, listener) {
+        if (typeof(filter) == 'string') {
+            filter = MochiKit.Logging.logLevelAtLeast(filter);
+        }
+        var entry = [filter, listener];
+        entry.ident = ident;
+        this.listeners[ident] = entry;
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.removeListener */
+    removeListener: function (ident) {
+        delete this.listeners[ident];
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.baseLog */
+    baseLog: function (level, message/*, ...*/) {
+        var msg = new MochiKit.Logging.LogMessage(
+            this.counter,
+            level,
+            MochiKit.Base.extend(null, arguments, 1)
+        );
+        this._messages.push(msg);
+        this.dispatchListeners(msg);
+        if (this.useNativeConsole) {
+            this.logToConsole(msg.level + ": " + msg.info.join(" "));
+        }
+        this.counter += 1;
+        while (this.maxSize >= 0 && this._messages.length > this.maxSize) {
+            this._messages.shift();
+        }
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.getMessages */
+    getMessages: function (howMany) {
+        var firstMsg = 0;
+        if (!(typeof(howMany) == 'undefined' || howMany === null)) {
+            firstMsg = Math.max(0, this._messages.length - howMany);
+        }
+        return this._messages.slice(firstMsg);
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.getMessageText */
+    getMessageText: function (howMany) {
+        if (typeof(howMany) == 'undefined' || howMany === null) {
+            howMany = 30;
+        }
+        var messages = this.getMessages(howMany);
+        if (messages.length) {
+            var lst = map(function (m) {
+                return '\n  [' + m.num + '] ' + m.level + ': ' + m.info.join(' ');
+            }, messages);
+            lst.unshift('LAST ' + messages.length + ' MESSAGES:');
+            return lst.join('');
+        }
+        return '';
+    },
+
+    /** @id MochiKit.Logging.Logger.prototype.debuggingBookmarklet */
+    debuggingBookmarklet: function (inline) {
+        if (typeof(MochiKit.LoggingPane) == "undefined") {
+            alert(this.getMessageText());
+        } else {
+            MochiKit.LoggingPane.createLoggingPane(inline || false);
+        }
+    }
+};
+
+MochiKit.Logging.__new__ = function () {
+    this.LogLevel = {
+        ERROR: 40,
+        FATAL: 50,
+        WARNING: 30,
+        INFO: 20,
+        DEBUG: 10
+    };
+
+    var m = MochiKit.Base;
+    m.registerComparator("LogMessage",
+        this.isLogMessage,
+        this.compareLogMessage
+    );
+
+    var partial = m.partial;
+
+    var Logger = this.Logger;
+    var baseLog = Logger.prototype.baseLog;
+    m.update(this.Logger.prototype, {
+        debug: partial(baseLog, 'DEBUG'),
+        log: partial(baseLog, 'INFO'),
+        error: partial(baseLog, 'ERROR'),
+        fatal: partial(baseLog, 'FATAL'),
+        warning: partial(baseLog, 'WARNING')
+    });
+
+    // indirectly find logger so it can be replaced
+    var self = this;
+    var connectLog = function (name) {
+        return function () {
+            self.logger[name].apply(self.logger, arguments);
+        };
+    };
+
+    /** @id MochiKit.Logging.log */
+    this.log = connectLog('log');
+    /** @id MochiKit.Logging.logError */
+    this.logError = connectLog('error');
+    /** @id MochiKit.Logging.logDebug */
+    this.logDebug = connectLog('debug');
+    /** @id MochiKit.Logging.logFatal */
+    this.logFatal = connectLog('fatal');
+    /** @id MochiKit.Logging.logWarning */
+    this.logWarning = connectLog('warning');
+    this.logger = new Logger();
+    this.logger.useNativeConsole = true;
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+
+};
+
+if (typeof(printfire) == "undefined" &&
+        typeof(document) != "undefined" && document.createEvent &&
+        typeof(dispatchEvent) != "undefined") {
+    // FireBug really should be less lame about this global function
+    printfire  = function () {
+        printfire.args = arguments;
+        var ev = document.createEvent("Events");
+        ev.initEvent("printfire", false, true);
+        dispatchEvent(ev);
+    };
+}
+
+MochiKit.Logging.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Logging);
diff --git a/IPython/external/external/MochiKit/LoggingPane.js b/IPython/external/external/MochiKit/LoggingPane.js
new file mode 100644
index 0000000..3798ae4
--- /dev/null
+++ b/IPython/external/external/MochiKit/LoggingPane.js
@@ -0,0 +1,374 @@
+/***
+
+MochiKit.LoggingPane 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.LoggingPane');
+    dojo.require('MochiKit.Logging');
+    dojo.require('MochiKit.Base');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Logging", []);
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined' || typeof(MochiKit.Logging) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.LoggingPane depends on MochiKit.Base and MochiKit.Logging!";
+}
+
+if (typeof(MochiKit.LoggingPane) == 'undefined') {
+    MochiKit.LoggingPane = {};
+}
+
+MochiKit.LoggingPane.NAME = "MochiKit.LoggingPane";
+MochiKit.LoggingPane.VERSION = "1.4";
+MochiKit.LoggingPane.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.LoggingPane.toString = function () {
+    return this.__repr__();
+};
+
+/** @id MochiKit.LoggingPane.createLoggingPane */
+MochiKit.LoggingPane.createLoggingPane = function (inline/* = false */) {
+    var m = MochiKit.LoggingPane;
+    inline = !(!inline);
+    if (m._loggingPane && m._loggingPane.inline != inline) {
+        m._loggingPane.closePane();
+        m._loggingPane = null;
+    }
+    if (!m._loggingPane || m._loggingPane.closed) {
+        m._loggingPane = new m.LoggingPane(inline, MochiKit.Logging.logger);
+    }
+    return m._loggingPane;
+};
+
+/** @id MochiKit.LoggingPane.LoggingPane */
+MochiKit.LoggingPane.LoggingPane = function (inline/* = false */, logger/* = MochiKit.Logging.logger */) {
+
+    /* Use a div if inline, pop up a window if not */
+    /* Create the elements */
+    if (typeof(logger) == "undefined" || logger === null) {
+        logger = MochiKit.Logging.logger;
+    }
+    this.logger = logger;
+    var update = MochiKit.Base.update;
+    var updatetree = MochiKit.Base.updatetree;
+    var bind = MochiKit.Base.bind;
+    var clone = MochiKit.Base.clone;
+    var win = window;
+    var uid = "_MochiKit_LoggingPane";
+    if (typeof(MochiKit.DOM) != "undefined") {
+        win = MochiKit.DOM.currentWindow();
+    }
+    if (!inline) {
+        // name the popup with the base URL for uniqueness
+        var url = win.location.href.split("?")[0].replace(/[#:\/.><&-]/g, "_");
+        var name = uid + "_" + url;
+        var nwin = win.open("", name, "dependent,resizable,height=200");
+        if (!nwin) {
+            alert("Not able to open debugging window due to pop-up blocking.");
+            return undefined;
+        }
+        nwin.document.write(
+            '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" '
+            + '"http://www.w3.org/TR/html4/loose.dtd">'
+            + '<html><head><title>[MochiKit.LoggingPane]</title></head>'
+            + '<body></body></html>'
+        );
+        nwin.document.close();
+        nwin.document.title += ' ' + win.document.title;
+        win = nwin;
+    }
+    var doc = win.document;
+    this.doc = doc;
+
+    // Connect to the debug pane if it already exists (i.e. in a window orphaned by the page being refreshed)
+    var debugPane = doc.getElementById(uid);
+    var existing_pane = !!debugPane;
+    if (debugPane && typeof(debugPane.loggingPane) != "undefined") {
+        debugPane.loggingPane.logger = this.logger;
+        debugPane.loggingPane.buildAndApplyFilter();
+        return debugPane.loggingPane;
+    }
+
+    if (existing_pane) {
+        // clear any existing contents
+        var child;
+        while ((child = debugPane.firstChild)) {
+            debugPane.removeChild(child);
+        }
+    } else {
+        debugPane = doc.createElement("div");
+        debugPane.id = uid;
+    }
+    debugPane.loggingPane = this;
+    var levelFilterField = doc.createElement("input");
+    var infoFilterField = doc.createElement("input");
+    var filterButton = doc.createElement("button");
+    var loadButton = doc.createElement("button");
+    var clearButton = doc.createElement("button");
+    var closeButton = doc.createElement("button");
+    var logPaneArea = doc.createElement("div");
+    var logPane = doc.createElement("div");
+
+    /* Set up the functions */
+    var listenerId = uid + "_Listener";
+    this.colorTable = clone(this.colorTable);
+    var messages = [];
+    var messageFilter = null;
+
+    /** @id MochiKit.LoggingPane.messageLevel */
+    var messageLevel = function (msg) {
+        var level = msg.level;
+        if (typeof(level) == "number") {
+            level = MochiKit.Logging.LogLevel[level];
+        }
+        return level;
+    };
+
+    /** @id MochiKit.LoggingPane.messageText */
+    var messageText = function (msg) {
+        return msg.info.join(" ");
+    };
+
+    /** @id MochiKit.LoggingPane.addMessageText */
+    var addMessageText = bind(function (msg) {
+        var level = messageLevel(msg);
+        var text = messageText(msg);
+        var c = this.colorTable[level];
+        var p = doc.createElement("span");
+        p.className = "MochiKit-LogMessage MochiKit-LogLevel-" + level;
+        p.style.cssText = "margin: 0px; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: pre-wrap; white-space: pre-line; word-wrap: break-word; wrap-option: emergency; color: " + c;
+        p.appendChild(doc.createTextNode(level + ": " + text));
+        logPane.appendChild(p);
+        logPane.appendChild(doc.createElement("br"));
+        if (logPaneArea.offsetHeight > logPaneArea.scrollHeight) {
+            logPaneArea.scrollTop = 0;
+        } else {
+            logPaneArea.scrollTop = logPaneArea.scrollHeight;
+        }
+    }, this);
+
+    /** @id MochiKit.LoggingPane.addMessage */
+    var addMessage = function (msg) {
+        messages[messages.length] = msg;
+        addMessageText(msg);
+    };
+
+    /** @id MochiKit.LoggingPane.buildMessageFilter */
+    var buildMessageFilter = function () {
+        var levelre, infore;
+        try {
+            /* Catch any exceptions that might arise due to invalid regexes */
+            levelre = new RegExp(levelFilterField.value);
+            infore = new RegExp(infoFilterField.value);
+        } catch(e) {
+            /* If there was an error with the regexes, do no filtering */
+            logDebug("Error in filter regex: " + e.message);
+            return null;
+        }
+
+        return function (msg) {
+            return (
+                levelre.test(messageLevel(msg)) &&
+                infore.test(messageText(msg))
+            );
+        };
+    };
+
+    /** @id MochiKit.LoggingPane.clearMessagePane */
+    var clearMessagePane = function () {
+        while (logPane.firstChild) {
+            logPane.removeChild(logPane.firstChild);
+        }
+    };
+
+    /** @id MochiKit.LoggingPane.clearMessages */
+    var clearMessages = function () {
+        messages = [];
+        clearMessagePane();
+    };
+
+    /** @id MochiKit.LoggingPane.closePane */
+    var closePane = bind(function () {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        if (MochiKit.LoggingPane._loggingPane == this) {
+            MochiKit.LoggingPane._loggingPane = null;
+        }
+        this.logger.removeListener(listenerId);
+        try {
+            try {
+              debugPane.loggingPane = null;
+            } catch(e) { logFatal("Bookmarklet was closed incorrectly."); }
+            if (inline) {
+                debugPane.parentNode.removeChild(debugPane);
+            } else {
+                this.win.close();
+            }
+        } catch(e) {}
+    }, this);
+
+    /** @id MochiKit.LoggingPane.filterMessages */
+    var filterMessages = function () {
+        clearMessagePane();
+
+        for (var i = 0; i < messages.length; i++) {
+            var msg = messages[i];
+            if (messageFilter === null || messageFilter(msg)) {
+                addMessageText(msg);
+            }
+        }
+    };
+
+    this.buildAndApplyFilter = function () {
+        messageFilter = buildMessageFilter();
+
+        filterMessages();
+
+        this.logger.removeListener(listenerId);
+        this.logger.addListener(listenerId, messageFilter, addMessage);
+    };
+
+
+    /** @id MochiKit.LoggingPane.loadMessages */
+    var loadMessages = bind(function () {
+        messages = this.logger.getMessages();
+        filterMessages();
+    }, this);
+
+    /** @id MochiKit.LoggingPane.filterOnEnter */
+    var filterOnEnter = bind(function (event) {
+        event = event || window.event;
+        key = event.which || event.keyCode;
+        if (key == 13) {
+            this.buildAndApplyFilter();
+        }
+    }, this);
+
+    /* Create the debug pane */
+    var style = "display: block; z-index: 1000; left: 0px; bottom: 0px; position: fixed; width: 100%; background-color: white; font: " + this.logFont;
+    if (inline) {
+        style += "; height: 10em; border-top: 2px solid black";
+    } else {
+        style += "; height: 100%;";
+    }
+    debugPane.style.cssText = style;
+
+    if (!existing_pane) {
+        doc.body.appendChild(debugPane);
+    }
+
+    /* Create the filter fields */
+    style = {"cssText": "width: 33%; display: inline; font: " + this.logFont};
+
+    updatetree(levelFilterField, {
+        "value": "FATAL|ERROR|WARNING|INFO|DEBUG",
+        "onkeypress": filterOnEnter,
+        "style": style
+    });
+    debugPane.appendChild(levelFilterField);
+
+    updatetree(infoFilterField, {
+        "value": ".*",
+        "onkeypress": filterOnEnter,
+        "style": style
+    });
+    debugPane.appendChild(infoFilterField);
+
+    /* Create the buttons */
+    style = "width: 8%; display:inline; font: " + this.logFont;
+
+    filterButton.appendChild(doc.createTextNode("Filter"));
+    filterButton.onclick = bind("buildAndApplyFilter", this);
+    filterButton.style.cssText = style;
+    debugPane.appendChild(filterButton);
+
+    loadButton.appendChild(doc.createTextNode("Load"));
+    loadButton.onclick = loadMessages;
+    loadButton.style.cssText = style;
+    debugPane.appendChild(loadButton);
+
+    clearButton.appendChild(doc.createTextNode("Clear"));
+    clearButton.onclick = clearMessages;
+    clearButton.style.cssText = style;
+    debugPane.appendChild(clearButton);
+
+    closeButton.appendChild(doc.createTextNode("Close"));
+    closeButton.onclick = closePane;
+    closeButton.style.cssText = style;
+    debugPane.appendChild(closeButton);
+
+    /* Create the logging pane */
+    logPaneArea.style.cssText = "overflow: auto; width: 100%";
+    logPane.style.cssText = "width: 100%; height: " + (inline ? "8em" : "100%");
+
+    logPaneArea.appendChild(logPane);
+    debugPane.appendChild(logPaneArea);
+
+    this.buildAndApplyFilter();
+    loadMessages();
+
+    if (inline) {
+        this.win = undefined;
+    } else {
+        this.win = win;
+    }
+    this.inline = inline;
+    this.closePane = closePane;
+    this.closed = false;
+
+
+    return this;
+};
+
+MochiKit.LoggingPane.LoggingPane.prototype = {
+    "logFont": "8pt Verdana,sans-serif",
+    "colorTable": {
+        "ERROR": "red",
+        "FATAL": "darkred",
+        "WARNING": "blue",
+        "INFO": "black",
+        "DEBUG": "green"
+    }
+};
+
+
+MochiKit.LoggingPane.EXPORT_OK = [
+    "LoggingPane"
+];
+
+MochiKit.LoggingPane.EXPORT = [
+    "createLoggingPane"
+];
+
+MochiKit.LoggingPane.__new__ = function () {
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": MochiKit.Base.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    MochiKit.Base.nameFunctions(this);
+
+    MochiKit.LoggingPane._loggingPane = null;
+
+};
+
+MochiKit.LoggingPane.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.LoggingPane);
diff --git a/IPython/external/external/MochiKit/MochiKit.js b/IPython/external/external/MochiKit/MochiKit.js
new file mode 100644
index 0000000..3a13b24
--- /dev/null
+++ b/IPython/external/external/MochiKit/MochiKit.js
@@ -0,0 +1,154 @@
+/***
+
+MochiKit.MochiKit 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(MochiKit) == 'undefined') {
+    MochiKit = {};
+}
+
+if (typeof(MochiKit.MochiKit) == 'undefined') {
+    /** @id MochiKit.MochiKit */
+    MochiKit.MochiKit = {};
+}
+
+MochiKit.MochiKit.NAME = "MochiKit.MochiKit";
+MochiKit.MochiKit.VERSION = "1.4";
+MochiKit.MochiKit.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+/** @id MochiKit.MochiKit.toString */
+MochiKit.MochiKit.toString = function () {
+    return this.__repr__();
+};
+
+/** @id MochiKit.MochiKit.SUBMODULES */
+MochiKit.MochiKit.SUBMODULES = [
+    "Base",
+    "Iter",
+    "Logging",
+    "DateTime",
+    "Format",
+    "Async",
+    "DOM",
+    "Selector",
+    "Style",
+    "LoggingPane",
+    "Color",
+    "Signal",
+    "Position",
+    "Visual"
+];
+
+if (typeof(JSAN) != 'undefined' || typeof(dojo) != 'undefined') {
+    if (typeof(dojo) != 'undefined') {
+        dojo.provide('MochiKit.MochiKit');
+        dojo.require("MochiKit.*");
+    }
+    if (typeof(JSAN) != 'undefined') {
+        (function (lst) {
+            for (var i = 0; i < lst.length; i++) {
+                JSAN.use("MochiKit." + lst[i], []);
+            }
+        })(MochiKit.MochiKit.SUBMODULES);
+    }
+    (function () {
+        var extend = MochiKit.Base.extend;
+        var self = MochiKit.MochiKit;
+        var modules = self.SUBMODULES;
+        var EXPORT = [];
+        var EXPORT_OK = [];
+        var EXPORT_TAGS = {};
+        var i, k, m, all;
+        for (i = 0; i < modules.length; i++) {
+            m = MochiKit[modules[i]];
+            extend(EXPORT, m.EXPORT);
+            extend(EXPORT_OK, m.EXPORT_OK);
+            for (k in m.EXPORT_TAGS) {
+                EXPORT_TAGS[k] = extend(EXPORT_TAGS[k], m.EXPORT_TAGS[k]);
+            }
+            all = m.EXPORT_TAGS[":all"];
+            if (!all) {
+                all = extend(null, m.EXPORT, m.EXPORT_OK);
+            }
+            var j;
+            for (j = 0; j < all.length; j++) {
+                k = all[j];
+                self[k] = m[k];
+            }
+        }
+        self.EXPORT = EXPORT;
+        self.EXPORT_OK = EXPORT_OK;
+        self.EXPORT_TAGS = EXPORT_TAGS;
+    }());
+
+} else {
+    if (typeof(MochiKit.__compat__) == 'undefined') {
+        MochiKit.__compat__ = true;
+    }
+    (function () {
+        if (typeof(document) == "undefined") {
+            return;
+        }
+        var scripts = document.getElementsByTagName("script");
+        var kXULNSURI = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        var base = null;
+        var baseElem = null;
+        var allScripts = {};
+        var i;
+        for (i = 0; i < scripts.length; i++) {
+            var src = scripts[i].getAttribute("src");
+            if (!src) {
+                continue;
+            }
+            allScripts[src] = true;
+            if (src.match(/MochiKit.js$/)) {
+                base = src.substring(0, src.lastIndexOf('MochiKit.js'));
+                baseElem = scripts[i];
+            }
+        }
+        if (base === null) {
+            return;
+        }
+        var modules = MochiKit.MochiKit.SUBMODULES;
+        for (var i = 0; i < modules.length; i++) {
+            if (MochiKit[modules[i]]) {
+                continue;
+            }
+            var uri = base + modules[i] + '.js';
+            if (uri in allScripts) {
+                continue;
+            }
+            if (document.documentElement &&
+                document.documentElement.namespaceURI == kXULNSURI) {
+                // XUL
+                var s = document.createElementNS(kXULNSURI, 'script');
+                s.setAttribute("id", "MochiKit_" + base + modules[i]);
+                s.setAttribute("src", uri);
+                s.setAttribute("type", "application/x-javascript");
+                baseElem.parentNode.appendChild(s);
+            } else {
+                // HTML
+                /*
+                    DOM can not be used here because Safari does
+                    deferred loading of scripts unless they are
+                    in the document or inserted with document.write
+
+                    This is not XHTML compliant.  If you want XHTML
+                    compliance then you must use the packed version of MochiKit
+                    or include each script individually (basically unroll
+                    these document.write calls into your XHTML source)
+
+                */
+                document.write('<script src="' + uri +
+                    '" type="text/javascript"></script>');
+            }
+        };
+    })();
+}
diff --git a/IPython/external/external/MochiKit/MockDOM.js b/IPython/external/external/MochiKit/MockDOM.js
new file mode 100644
index 0000000..92558cb
--- /dev/null
+++ b/IPython/external/external/MochiKit/MockDOM.js
@@ -0,0 +1,115 @@
+/***
+
+MochiKit.MockDOM 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(MochiKit) == "undefined") {
+    MochiKit = {};
+}
+
+if (typeof(MochiKit.MockDOM) == "undefined") {
+    MochiKit.MockDOM = {};
+}
+
+MochiKit.MockDOM.NAME = "MochiKit.MockDOM";
+MochiKit.MockDOM.VERSION = "1.4";
+
+MochiKit.MockDOM.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+/** @id MochiKit.MockDOM.toString */
+MochiKit.MockDOM.toString = function () {
+    return this.__repr__();
+};
+
+/** @id MochiKit.MockDOM.createDocument */
+MochiKit.MockDOM.createDocument = function () {
+    var doc = new MochiKit.MockDOM.MockElement("DOCUMENT");
+    doc.body = doc.createElement("BODY");
+    doc.appendChild(doc.body);
+    return doc;
+};
+
+/** @id MochiKit.MockDOM.MockElement */
+MochiKit.MockDOM.MockElement = function (name, data, ownerDocument) {
+    this.tagName = this.nodeName = name.toUpperCase();
+    this.ownerDocument = ownerDocument || null;
+    if (name == "DOCUMENT") {
+        this.nodeType = 9;
+        this.childNodes = [];
+    } else if (typeof(data) == "string") {
+        this.nodeValue = data;
+        this.nodeType = 3;
+    } else {
+        this.nodeType = 1;
+        this.childNodes = [];
+    }
+    if (name.substring(0, 1) == "<") {
+        var nameattr = name.substring(
+            name.indexOf('"') + 1, name.lastIndexOf('"'));
+        name = name.substring(1, name.indexOf(" "));
+        this.tagName = this.nodeName = name.toUpperCase();
+        this.setAttribute("name", nameattr);
+    }
+};
+
+MochiKit.MockDOM.MockElement.prototype = {
+    /** @id MochiKit.MockDOM.MockElement.prototype.createElement */
+    createElement: function (tagName) {
+        return new MochiKit.MockDOM.MockElement(tagName, null, this.nodeType == 9 ? this : this.ownerDocument);
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.createTextNode */
+    createTextNode: function (text) {
+        return new MochiKit.MockDOM.MockElement("text", text, this.nodeType == 9 ? this : this.ownerDocument);
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.setAttribute */
+    setAttribute: function (name, value) {
+        this[name] = value;
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.getAttribute */
+    getAttribute: function (name) {
+        return this[name];
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.appendChild */
+    appendChild: function (child) {
+        this.childNodes.push(child);
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.toString */
+    toString: function () {
+        return "MockElement(" + this.tagName + ")";
+    },
+    /** @id MochiKit.MockDOM.MockElement.prototype.getElementsByTagName */
+    getElementsByTagName: function (tagName) {
+        var foundElements = [];
+        MochiKit.Base.nodeWalk(this, function(node){
+            if (tagName == '*' || tagName == node.tagName) {
+                foundElements.push(node);
+                return node.childNodes;
+            }
+        });
+        return foundElements;
+    }
+};
+
+    /** @id MochiKit.MockDOM.EXPORT_OK */
+MochiKit.MockDOM.EXPORT_OK = [
+    "mockElement",
+    "createDocument"
+];
+
+    /** @id MochiKit.MockDOM.EXPORT */
+MochiKit.MockDOM.EXPORT = [
+    "document"
+];
+
+MochiKit.MockDOM.__new__ = function () {
+    this.document = this.createDocument();
+};
+
+MochiKit.MockDOM.__new__();
diff --git a/IPython/external/external/MochiKit/Position.js b/IPython/external/external/MochiKit/Position.js
new file mode 100644
index 0000000..23b0f18
--- /dev/null
+++ b/IPython/external/external/MochiKit/Position.js
@@ -0,0 +1,258 @@
+/***
+
+MochiKit.Position 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005-2006 Bob Ippolito and others.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Position');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Style');
+}
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use('MochiKit.Base', []);
+    JSAN.use('MochiKit.DOM', []);
+    JSAN.use('MochiKit.Style', []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined' ||
+        typeof(MochiKit.Style) == 'undefined' ||
+        typeof(MochiKit.DOM) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Style depends on MochiKit.Base, MochiKit.DOM, and MochiKit.Style!';
+}
+
+if (typeof(MochiKit.Position) == 'undefined') {
+    MochiKit.Position = {};
+}
+
+MochiKit.Position.NAME = 'MochiKit.Position';
+MochiKit.Position.VERSION = '1.4';
+MochiKit.Position.__repr__ = function () {
+    return '[' + this.NAME + ' ' + this.VERSION + ']';
+};
+MochiKit.Position.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Position.EXPORT_OK = [];
+
+MochiKit.Position.EXPORT = [
+];
+
+
+MochiKit.Base.update(MochiKit.Position, {
+    // set to true if needed, warning: firefox performance problems
+    // NOT neeeded for page scrolling, only if draggable contained in
+    // scrollable elements
+    includeScrollOffsets: false,
+
+    /** @id MochiKit.Position.prepare */
+    prepare: function () {
+        var deltaX =  window.pageXOffset
+                   || document.documentElement.scrollLeft
+                   || document.body.scrollLeft
+                   || 0;
+        var deltaY =  window.pageYOffset
+                   || document.documentElement.scrollTop
+                   || document.body.scrollTop
+                   || 0;
+        this.windowOffset = new MochiKit.Style.Coordinates(deltaX, deltaY);
+    },
+
+    /** @id MochiKit.Position.cumulativeOffset */
+    cumulativeOffset: function (element) {
+        var valueT = 0;
+        var valueL = 0;
+        do {
+            valueT += element.offsetTop  || 0;
+            valueL += element.offsetLeft || 0;
+            element = element.offsetParent;
+        } while (element);
+        return new MochiKit.Style.Coordinates(valueL, valueT);
+    },
+
+    /** @id MochiKit.Position.realOffset */
+    realOffset: function (element) {
+        var valueT = 0;
+        var valueL = 0;
+        do {
+            valueT += element.scrollTop  || 0;
+            valueL += element.scrollLeft || 0;
+            element = element.parentNode;
+        } while (element);
+        return new MochiKit.Style.Coordinates(valueL, valueT);
+    },
+
+    /** @id MochiKit.Position.within */
+    within: function (element, x, y) {
+        if (this.includeScrollOffsets) {
+            return this.withinIncludingScrolloffsets(element, x, y);
+        }
+        this.xcomp = x;
+        this.ycomp = y;
+        this.offset = this.cumulativeOffset(element);
+        if (element.style.position == "fixed") {
+            this.offset.x += this.windowOffset.x;
+            this.offset.y += this.windowOffset.y;
+        }
+
+        return (y >= this.offset.y &&
+                y <  this.offset.y + element.offsetHeight &&
+                x >= this.offset.x &&
+                x <  this.offset.x + element.offsetWidth);
+    },
+
+    /** @id MochiKit.Position.withinIncludingScrolloffsets */
+    withinIncludingScrolloffsets: function (element, x, y) {
+        var offsetcache = this.realOffset(element);
+
+        this.xcomp = x + offsetcache.x - this.windowOffset.x;
+        this.ycomp = y + offsetcache.y - this.windowOffset.y;
+        this.offset = this.cumulativeOffset(element);
+
+        return (this.ycomp >= this.offset.y &&
+                this.ycomp <  this.offset.y + element.offsetHeight &&
+                this.xcomp >= this.offset.x &&
+                this.xcomp <  this.offset.x + element.offsetWidth);
+    },
+
+    // within must be called directly before
+    /** @id MochiKit.Position.overlap */
+    overlap: function (mode, element) {
+        if (!mode) {
+            return 0;
+        }
+        if (mode == 'vertical') {
+          return ((this.offset.y + element.offsetHeight) - this.ycomp) /
+                 element.offsetHeight;
+        }
+        if (mode == 'horizontal') {
+          return ((this.offset.x + element.offsetWidth) - this.xcomp) /
+                 element.offsetWidth;
+        }
+    },
+
+    /** @id MochiKit.Position.absolutize */
+    absolutize: function (element) {
+        element = MochiKit.DOM.getElement(element);
+        if (element.style.position == 'absolute') {
+            return;
+        }
+        MochiKit.Position.prepare();
+
+        var offsets = MochiKit.Position.positionedOffset(element);
+        var width = element.clientWidth;
+        var height = element.clientHeight;
+
+        var oldStyle = {
+            'position': element.style.position,
+            'left': offsets.x - parseFloat(element.style.left  || 0),
+            'top': offsets.y - parseFloat(element.style.top || 0),
+            'width': element.style.width,
+            'height': element.style.height
+        };
+
+        element.style.position = 'absolute';
+        element.style.top = offsets.y + 'px';
+        element.style.left = offsets.x + 'px';
+        element.style.width = width + 'px';
+        element.style.height = height + 'px';
+
+        return oldStyle;
+    },
+
+    /** @id MochiKit.Position.positionedOffset */
+    positionedOffset: function (element) {
+        var valueT = 0, valueL = 0;
+        do {
+            valueT += element.offsetTop  || 0;
+            valueL += element.offsetLeft || 0;
+            element = element.offsetParent;
+            if (element) {
+                p = MochiKit.Style.getStyle(element, 'position');
+                if (p == 'relative' || p == 'absolute') {
+                    break;
+                }
+            }
+        } while (element);
+        return new MochiKit.Style.Coordinates(valueL, valueT);
+    },
+
+    /** @id MochiKit.Position.relativize */
+    relativize: function (element, oldPos) {
+        element = MochiKit.DOM.getElement(element);
+        if (element.style.position == 'relative') {
+            return;
+        }
+        MochiKit.Position.prepare();
+
+        var top = parseFloat(element.style.top || 0) -
+                  (oldPos['top'] || 0);
+        var left = parseFloat(element.style.left || 0) -
+                   (oldPos['left'] || 0);
+
+        element.style.position = oldPos['position'];
+        element.style.top = top + 'px';
+        element.style.left = left + 'px';
+        element.style.width = oldPos['width'];
+        element.style.height = oldPos['height'];
+    },
+
+    /** @id MochiKit.Position.clone */
+    clone: function (source, target) {
+        source = MochiKit.DOM.getElement(source);
+        target = MochiKit.DOM.getElement(target);
+        target.style.position = 'absolute';
+        var offsets = this.cumulativeOffset(source);
+        target.style.top = offsets.y + 'px';
+        target.style.left = offsets.x + 'px';
+        target.style.width = source.offsetWidth + 'px';
+        target.style.height = source.offsetHeight + 'px';
+    },
+
+    /** @id MochiKit.Position.page */
+    page: function (forElement) {
+        var valueT = 0;
+        var valueL = 0;
+
+        var element = forElement;
+        do {
+            valueT += element.offsetTop  || 0;
+            valueL += element.offsetLeft || 0;
+
+            // Safari fix
+            if (element.offsetParent == document.body && MochiKit.Style.getStyle(element, 'position') == 'absolute') {
+                break;
+            }
+        } while (element = element.offsetParent);
+
+        element = forElement;
+        do {
+            valueT -= element.scrollTop  || 0;
+            valueL -= element.scrollLeft || 0;
+        } while (element = element.parentNode);
+
+        return new MochiKit.Style.Coordinates(valueL, valueT);
+    }
+});
+
+MochiKit.Position.__new__ = function (win) {
+    var m = MochiKit.Base;
+    this.EXPORT_TAGS = {
+        ':common': this.EXPORT,
+        ':all': m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+};
+
+MochiKit.Position.__new__(this);
\ No newline at end of file
diff --git a/IPython/external/external/MochiKit/Selector.js b/IPython/external/external/MochiKit/Selector.js
new file mode 100644
index 0000000..f5d1afa
--- /dev/null
+++ b/IPython/external/external/MochiKit/Selector.js
@@ -0,0 +1,431 @@
+/***
+
+MochiKit.Selector 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito and others.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Selector');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Iter');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+    JSAN.use("MochiKit.DOM", []);
+    JSAN.use("MochiKit.Iter", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) === 'undefined' ||
+        typeof(MochiKit.DOM) === 'undefined' ||
+        typeof(MochiKit.Iter) === 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Selector depends on MochiKit.Base, MochiKit.DOM and MochiKit.Iter!";
+}
+
+if (typeof(MochiKit.Selector) == 'undefined') {
+    MochiKit.Selector = {};
+}
+
+MochiKit.Selector.NAME = "MochiKit.Selector";
+
+MochiKit.Selector.VERSION = "1.4";
+
+MochiKit.Selector.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.Selector.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Selector.EXPORT = [
+    "Selector",
+    "findChildElements",
+    "findDocElements",
+    "$$"
+];
+
+MochiKit.Selector.EXPORT_OK = [
+];
+
+MochiKit.Selector.Selector = function (expression) {
+    this.params = {classNames: [], pseudoClassNames: []};
+    this.expression = expression.toString().replace(/(^\s+|\s+$)/g, '');
+    this.parseExpression();
+    this.compileMatcher();
+};
+
+MochiKit.Selector.Selector.prototype = {
+    /***
+
+    Selector class: convenient object to make CSS selections.
+
+    ***/
+    __class__: MochiKit.Selector.Selector,
+
+    /** @id MochiKit.Selector.Selector.prototype.parseExpression */
+    parseExpression: function () {
+        function abort(message) {
+            throw 'Parse error in selector: ' + message;
+        }
+
+        if (this.expression == '')  {
+            abort('empty expression');
+        }
+
+        var repr = MochiKit.Base.repr;
+        var params = this.params;
+        var expr = this.expression;
+        var match, modifier, clause, rest;
+        while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!^$*]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
+            params.attributes = params.attributes || [];
+            params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
+            expr = match[1];
+        }
+
+        if (expr == '*') {
+            return this.params.wildcard = true;
+        }
+
+        while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+(?:\([^)]*\))?)(.*)/i)) {
+            modifier = match[1];
+            clause = match[2];
+            rest = match[3];
+            switch (modifier) {
+                case '#':
+                    params.id = clause;
+                    break;
+                case '.':
+                    params.classNames.push(clause);
+                    break;
+                case ':':
+                    params.pseudoClassNames.push(clause);
+                    break;
+                case '':
+                case undefined:
+                    params.tagName = clause.toUpperCase();
+                    break;
+                default:
+                    abort(repr(expr));
+            }
+            expr = rest;
+        }
+
+        if (expr.length > 0) {
+            abort(repr(expr));
+        }
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.buildMatchExpression */
+    buildMatchExpression: function () {
+        var repr = MochiKit.Base.repr;
+        var params = this.params;
+        var conditions = [];
+        var clause, i;
+
+        function childElements(element) {
+            return "MochiKit.Base.filter(function (node) { return node.nodeType == 1; }, " + element + ".childNodes)";
+        }
+
+        if (params.wildcard) {
+            conditions.push('true');
+        }
+        if (clause = params.id) {
+            conditions.push('element.id == ' + repr(clause));
+        }
+        if (clause = params.tagName) {
+            conditions.push('element.tagName.toUpperCase() == ' + repr(clause));
+        }
+        if ((clause = params.classNames).length > 0) {
+            for (i = 0; i < clause.length; i++) {
+                conditions.push('MochiKit.DOM.hasElementClass(element, ' + repr(clause[i]) + ')');
+            }
+        }
+        if ((clause = params.pseudoClassNames).length > 0) {
+            for (i = 0; i < clause.length; i++) {
+                var match = clause[i].match(/^([^(]+)(?:\((.*)\))?$/);
+                var pseudoClass = match[1];
+                var pseudoClassArgument = match[2];
+                switch (pseudoClass) {
+                    case 'root':
+                        conditions.push('element.nodeType == 9 || element === element.ownerDocument.documentElement'); break;
+                    case 'nth-child':
+                    case 'nth-last-child':
+                    case 'nth-of-type':
+                    case 'nth-last-of-type':
+                        match = pseudoClassArgument.match(/^((?:(\d+)n\+)?(\d+)|odd|even)$/);
+                        if (!match) {
+                            throw "Invalid argument to pseudo element nth-child: " + pseudoClassArgument;
+                        }
+                        var a, b;
+                        if (match[0] == 'odd') {
+                            a = 2;
+                            b = 1;
+                        } else if (match[0] == 'even') {
+                            a = 2;
+                            b = 0;
+                        } else {
+                            a = match[2] && parseInt(match) || null;
+                            b = parseInt(match[3]);
+                        }
+                        conditions.push('this.nthChild(element,' + a + ',' + b
+                                        + ',' + !!pseudoClass.match('^nth-last')    // Reverse
+                                        + ',' + !!pseudoClass.match('of-type$')     // Restrict to same tagName
+                                        + ')');
+                        break;
+                    case 'first-child':
+                        conditions.push('this.nthChild(element, null, 1)');
+                        break;
+                    case 'last-child':
+                        conditions.push('this.nthChild(element, null, 1, true)');
+                        break;
+                    case 'first-of-type':
+                        conditions.push('this.nthChild(element, null, 1, false, true)');
+                        break;
+                    case 'last-of-type':
+                        conditions.push('this.nthChild(element, null, 1, true, true)');
+                        break;
+                    case 'only-child':
+                        conditions.push(childElements('element.parentNode') + '.length == 1');
+                        break;
+                    case 'only-of-type':
+                        conditions.push('MochiKit.Base.filter(function (node) { return node.tagName == element.tagName; }, ' + childElements('element.parentNode') + ').length == 1');
+                        break;
+                    case 'empty':
+                        conditions.push('element.childNodes.length == 0');
+                        break;
+                    case 'enabled':
+                        conditions.push('(this.isUIElement(element) && element.disabled === false)');
+                        break;
+                    case 'disabled':
+                        conditions.push('(this.isUIElement(element) && element.disabled === true)');
+                        break;
+                    case 'checked':
+                        conditions.push('(this.isUIElement(element) && element.checked === true)');
+                        break;
+                    case 'not':
+                        var subselector = new MochiKit.Selector.Selector(pseudoClassArgument);
+                        conditions.push('!( ' + subselector.buildMatchExpression() + ')')
+                        break;
+                }
+            }
+        }
+        if (clause = params.attributes) {
+            MochiKit.Base.map(function (attribute) {
+                var value = 'MochiKit.DOM.getNodeAttribute(element, ' + repr(attribute.name) + ')';
+                var splitValueBy = function (delimiter) {
+                    return value + '.split(' + repr(delimiter) + ')';
+                }
+
+                switch (attribute.operator) {
+                    case '=':
+                        conditions.push(value + ' == ' + repr(attribute.value));
+                        break;
+                    case '~=':
+                        conditions.push(value + ' && MochiKit.Base.findValue(' + splitValueBy(' ') + ', ' + repr(attribute.value) + ') > -1');
+                        break;
+                    case '^=':
+                        conditions.push(value + '.substring(0, ' + attribute.value.length + ') == ' + repr(attribute.value));
+                        break;
+                    case '$=':
+                        conditions.push(value + '.substring(' + value + '.length - ' + attribute.value.length + ') == ' + repr(attribute.value));
+                        break;
+                    case '*=':
+                        conditions.push(value + '.match(' + repr(attribute.value) + ')');
+                        break;
+                    case '|=':
+                        conditions.push(
+                            value + ' && ' + splitValueBy('-') + '[0].toUpperCase() == ' + repr(attribute.value.toUpperCase())
+                        );
+                        break;
+                    case '!=':
+                        conditions.push(value + ' != ' + repr(attribute.value));
+                        break;
+                    case '':
+                    case undefined:
+                        conditions.push(value + ' != null');
+                        break;
+                    default:
+                        throw 'Unknown operator ' + attribute.operator + ' in selector';
+                }
+            }, clause);
+        }
+
+        return conditions.join(' && ');
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.compileMatcher */
+    compileMatcher: function () {
+        this.match = new Function('element', 'if (!element.tagName) return false; \
+                return ' + this.buildMatchExpression());
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.nthChild */
+    nthChild: function (element, a, b, reverse, sametag){
+        var siblings = MochiKit.Base.filter(function (node) {
+            return node.nodeType == 1;
+        }, element.parentNode.childNodes);
+        if (sametag) {
+            siblings = MochiKit.Base.filter(function (node) {
+                return node.tagName == element.tagName;
+            }, siblings);
+        }
+        if (reverse) {
+            siblings = MochiKit.Iter.reversed(siblings);
+        }
+        if (a) {
+            var actualIndex = MochiKit.Base.findIdentical(siblings, element);
+            return ((actualIndex + 1 - b) / a) % 1 == 0;
+        } else {
+            return b == MochiKit.Base.findIdentical(siblings, element) + 1;
+        }
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.isUIElement */
+    isUIElement: function (element) {
+        return MochiKit.Base.findValue(['input', 'button', 'select', 'option', 'textarea', 'object'],
+                element.tagName.toLowerCase()) > -1;
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.findElements */
+    findElements: function (scope, axis) {
+        var element;
+
+        if (axis == undefined) {
+            axis = "";
+        }
+
+        function inScope(element, scope) {
+            if (axis == "") {
+                return MochiKit.DOM.isChildNode(element, scope);
+            } else if (axis == ">") {
+                return element.parentNode == scope;
+            } else if (axis == "+") {
+                return element == nextSiblingElement(scope);
+            } else if (axis == "~") {
+                var sibling = scope;
+                while (sibling = nextSiblingElement(sibling)) {
+                    if (element == sibling) {
+                        return true;
+                    }
+                }
+                return false;
+            } else {
+                throw "Invalid axis: " + axis;
+            }
+        }
+
+        if (element = MochiKit.DOM.getElement(this.params.id)) {
+            if (this.match(element)) {
+                if (!scope || inScope(element, scope)) {
+                    return [element];
+                }
+            }
+        }
+
+        function nextSiblingElement(node) {
+            node = node.nextSibling;
+            while (node && node.nodeType != 1) {
+                node = node.nextSibling;
+            }
+            return node;
+        }
+
+        if (axis == "") {
+            scope = (scope || MochiKit.DOM.currentDocument()).getElementsByTagName(this.params.tagName || '*');
+        } else if (axis == ">") {
+            if (!scope) {
+                throw "> combinator not allowed without preceeding expression";
+            }
+            scope = MochiKit.Base.filter(function (node) {
+                return node.nodeType == 1;
+            }, scope.childNodes);
+        } else if (axis == "+") {
+            if (!scope) {
+                throw "+ combinator not allowed without preceeding expression";
+            }
+            scope = nextSiblingElement(scope) && [nextSiblingElement(scope)];
+        } else if (axis == "~") {
+            if (!scope) {
+                throw "~ combinator not allowed without preceeding expression";
+            }
+            var newscope = [];
+            while (nextSiblingElement(scope)) {
+                scope = nextSiblingElement(scope);
+                newscope.push(scope);
+            }
+            scope = newscope;
+        }
+
+        if (!scope) {
+            return [];
+        }
+
+        var results = MochiKit.Base.filter(MochiKit.Base.bind(function (scopeElt) {
+            return this.match(scopeElt);
+        }, this), scope);
+
+        return results;
+    },
+
+    /** @id MochiKit.Selector.Selector.prototype.repr */
+    repr: function () {
+        return 'Selector(' + this.expression + ')';
+    },
+
+    toString: MochiKit.Base.forwardCall("repr")
+};
+
+MochiKit.Base.update(MochiKit.Selector, {
+
+    /** @id MochiKit.Selector.findChildElements */
+    findChildElements: function (element, expressions) {
+        return MochiKit.Base.flattenArray(MochiKit.Base.map(function (expression) {
+            var nextScope = "";
+            return MochiKit.Iter.reduce(function (results, expr) {
+                if (match = expr.match(/^[>+~]$/)) {
+                    nextScope = match[0];
+                    return results;
+                } else {
+                    var selector = new MochiKit.Selector.Selector(expr);
+                    var elements = MochiKit.Iter.reduce(function (elements, result) {
+                        return MochiKit.Base.extend(elements, selector.findElements(result || element, nextScope));
+                    }, results, []);
+                    nextScope = "";
+                    return elements;
+                }
+            }, expression.replace(/(^\s+|\s+$)/g, '').split(/\s+/), [null]);
+        }, expressions));
+    },
+
+    findDocElements: function () {
+        return MochiKit.Selector.findChildElements(MochiKit.DOM.currentDocument(), arguments);
+    },
+
+    __new__: function () {
+        var m = MochiKit.Base;
+
+        this.$$ = this.findDocElements;
+
+        this.EXPORT_TAGS = {
+            ":common": this.EXPORT,
+            ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+        };
+
+        m.nameFunctions(this);
+    }
+});
+
+MochiKit.Selector.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Selector);
+
diff --git a/IPython/external/external/MochiKit/Signal.js b/IPython/external/external/MochiKit/Signal.js
new file mode 100644
index 0000000..de50240
--- /dev/null
+++ b/IPython/external/external/MochiKit/Signal.js
@@ -0,0 +1,903 @@
+/***
+
+MochiKit.Signal 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2006 Jonathan Gardner, Beau Hartshorne, Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Signal');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Style');
+}
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use('MochiKit.Base', []);
+    JSAN.use('MochiKit.DOM', []);
+    JSAN.use('MochiKit.Style', []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Signal depends on MochiKit.Base!';
+}
+
+try {
+    if (typeof(MochiKit.DOM) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Signal depends on MochiKit.DOM!';
+}
+
+try {
+    if (typeof(MochiKit.Style) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Signal depends on MochiKit.Style!';
+}
+
+if (typeof(MochiKit.Signal) == 'undefined') {
+    MochiKit.Signal = {};
+}
+
+MochiKit.Signal.NAME = 'MochiKit.Signal';
+MochiKit.Signal.VERSION = '1.4';
+
+MochiKit.Signal._observers = [];
+
+/** @id MochiKit.Signal.Event */
+MochiKit.Signal.Event = function (src, e) {
+    this._event = e || window.event;
+    this._src = src;
+};
+
+MochiKit.Base.update(MochiKit.Signal.Event.prototype, {
+
+    __repr__: function () {
+        var repr = MochiKit.Base.repr;
+        var str = '{event(): ' + repr(this.event()) +
+            ', src(): ' + repr(this.src()) +
+            ', type(): ' + repr(this.type()) +
+            ', target(): ' + repr(this.target());
+
+        if (this.type() &&
+            this.type().indexOf('key') === 0 ||
+            this.type().indexOf('mouse') === 0 ||
+            this.type().indexOf('click') != -1 ||
+            this.type() == 'contextmenu') {
+            str += ', modifier(): ' + '{alt: ' + repr(this.modifier().alt) +
+            ', ctrl: ' + repr(this.modifier().ctrl) +
+            ', meta: ' + repr(this.modifier().meta) +
+            ', shift: ' + repr(this.modifier().shift) +
+            ', any: ' + repr(this.modifier().any) + '}';
+        }
+
+        if (this.type() && this.type().indexOf('key') === 0) {
+            str += ', key(): {code: ' + repr(this.key().code) +
+                ', string: ' + repr(this.key().string) + '}';
+        }
+
+        if (this.type() && (
+            this.type().indexOf('mouse') === 0 ||
+            this.type().indexOf('click') != -1 ||
+            this.type() == 'contextmenu')) {
+
+            str += ', mouse(): {page: ' + repr(this.mouse().page) +
+                ', client: ' + repr(this.mouse().client);
+
+            if (this.type() != 'mousemove') {
+                str += ', button: {left: ' + repr(this.mouse().button.left) +
+                    ', middle: ' + repr(this.mouse().button.middle) +
+                    ', right: ' + repr(this.mouse().button.right) + '}}';
+            } else {
+                str += '}';
+            }
+        }
+        if (this.type() == 'mouseover' || this.type() == 'mouseout') {
+            str += ', relatedTarget(): ' + repr(this.relatedTarget());
+        }
+        str += '}';
+        return str;
+    },
+
+     /** @id MochiKit.Signal.Event.prototype.toString */
+    toString: function () {
+        return this.__repr__();
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.src */
+    src: function () {
+        return this._src;
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.event  */
+    event: function () {
+        return this._event;
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.type */
+    type: function () {
+        return this._event.type || undefined;
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.target */
+    target: function () {
+        return this._event.target || this._event.srcElement;
+    },
+
+    _relatedTarget: null,
+    /** @id MochiKit.Signal.Event.prototype.relatedTarget */
+    relatedTarget: function () {
+        if (this._relatedTarget !== null) {
+            return this._relatedTarget;
+        }
+
+        var elem = null;
+        if (this.type() == 'mouseover') {
+            elem = (this._event.relatedTarget ||
+                this._event.fromElement);
+        } else if (this.type() == 'mouseout') {
+            elem = (this._event.relatedTarget ||
+                this._event.toElement);
+        }
+        if (elem !== null) {
+            this._relatedTarget = elem;
+            return elem;
+        }
+
+        return undefined;
+    },
+
+    _modifier: null,
+    /** @id MochiKit.Signal.Event.prototype.modifier */
+    modifier: function () {
+        if (this._modifier !== null) {
+            return this._modifier;
+        }
+        var m = {};
+        m.alt = this._event.altKey;
+        m.ctrl = this._event.ctrlKey;
+        m.meta = this._event.metaKey || false; // IE and Opera punt here
+        m.shift = this._event.shiftKey;
+        m.any = m.alt || m.ctrl || m.shift || m.meta;
+        this._modifier = m;
+        return m;
+    },
+
+    _key: null,
+    /** @id MochiKit.Signal.Event.prototype.key */
+    key: function () {
+        if (this._key !== null) {
+            return this._key;
+        }
+        var k = {};
+        if (this.type() && this.type().indexOf('key') === 0) {
+
+            /*
+
+                If you're looking for a special key, look for it in keydown or
+                keyup, but never keypress. If you're looking for a Unicode
+                chracter, look for it with keypress, but never keyup or
+                keydown.
+
+                Notes:
+
+                FF key event behavior:
+                key     event   charCode    keyCode
+                DOWN    ku,kd   0           40
+                DOWN    kp      0           40
+                ESC     ku,kd   0           27
+                ESC     kp      0           27
+                a       ku,kd   0           65
+                a       kp      97          0
+                shift+a ku,kd   0           65
+                shift+a kp      65          0
+                1       ku,kd   0           49
+                1       kp      49          0
+                shift+1 ku,kd   0           0
+                shift+1 kp      33          0
+
+                IE key event behavior:
+                (IE doesn't fire keypress events for special keys.)
+                key     event   keyCode
+                DOWN    ku,kd   40
+                DOWN    kp      undefined
+                ESC     ku,kd   27
+                ESC     kp      27
+                a       ku,kd   65
+                a       kp      97
+                shift+a ku,kd   65
+                shift+a kp      65
+                1       ku,kd   49
+                1       kp      49
+                shift+1 ku,kd   49
+                shift+1 kp      33
+
+                Safari key event behavior:
+                (Safari sets charCode and keyCode to something crazy for
+                special keys.)
+                key     event   charCode    keyCode
+                DOWN    ku,kd   63233       40
+                DOWN    kp      63233       63233
+                ESC     ku,kd   27          27
+                ESC     kp      27          27
+                a       ku,kd   97          65
+                a       kp      97          97
+                shift+a ku,kd   65          65
+                shift+a kp      65          65
+                1       ku,kd   49          49
+                1       kp      49          49
+                shift+1 ku,kd   33          49
+                shift+1 kp      33          33
+
+            */
+
+            /* look for special keys here */
+            if (this.type() == 'keydown' || this.type() == 'keyup') {
+                k.code = this._event.keyCode;
+                k.string = (MochiKit.Signal._specialKeys[k.code] ||
+                    'KEY_UNKNOWN');
+                this._key = k;
+                return k;
+
+            /* look for characters here */
+            } else if (this.type() == 'keypress') {
+
+                /*
+
+                    Special key behavior:
+
+                    IE: does not fire keypress events for special keys
+                    FF: sets charCode to 0, and sets the correct keyCode
+                    Safari: sets keyCode and charCode to something stupid
+
+                */
+
+                k.code = 0;
+                k.string = '';
+
+                if (typeof(this._event.charCode) != 'undefined' &&
+                    this._event.charCode !== 0 &&
+                    !MochiKit.Signal._specialMacKeys[this._event.charCode]) {
+                    k.code = this._event.charCode;
+                    k.string = String.fromCharCode(k.code);
+                } else if (this._event.keyCode &&
+                    typeof(this._event.charCode) == 'undefined') { // IE
+                    k.code = this._event.keyCode;
+                    k.string = String.fromCharCode(k.code);
+                }
+
+                this._key = k;
+                return k;
+            }
+        }
+        return undefined;
+    },
+
+    _mouse: null,
+    /** @id MochiKit.Signal.Event.prototype.mouse */
+    mouse: function () {
+        if (this._mouse !== null) {
+            return this._mouse;
+        }
+
+        var m = {};
+        var e = this._event;
+
+        if (this.type() && (
+            this.type().indexOf('mouse') === 0 ||
+            this.type().indexOf('click') != -1 ||
+            this.type() == 'contextmenu')) {
+
+            m.client = new MochiKit.Style.Coordinates(0, 0);
+            if (e.clientX || e.clientY) {
+                m.client.x = (!e.clientX || e.clientX < 0) ? 0 : e.clientX;
+                m.client.y = (!e.clientY || e.clientY < 0) ? 0 : e.clientY;
+            }
+
+            m.page = new MochiKit.Style.Coordinates(0, 0);
+            if (e.pageX || e.pageY) {
+                m.page.x = (!e.pageX || e.pageX < 0) ? 0 : e.pageX;
+                m.page.y = (!e.pageY || e.pageY < 0) ? 0 : e.pageY;
+            } else {
+                /*
+
+                    The IE shortcut can be off by two. We fix it. See:
+                    http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/getboundingclientrect.asp
+
+                    This is similar to the method used in
+                    MochiKit.Style.getElementPosition().
+
+                */
+                var de = MochiKit.DOM._document.documentElement;
+                var b = MochiKit.DOM._document.body;
+
+                m.page.x = e.clientX +
+                    (de.scrollLeft || b.scrollLeft) -
+                    (de.clientLeft || 0);
+
+                m.page.y = e.clientY +
+                    (de.scrollTop || b.scrollTop) -
+                    (de.clientTop || 0);
+
+            }
+            if (this.type() != 'mousemove') {
+                m.button = {};
+                m.button.left = false;
+                m.button.right = false;
+                m.button.middle = false;
+
+                /* we could check e.button, but which is more consistent */
+                if (e.which) {
+                    m.button.left = (e.which == 1);
+                    m.button.middle = (e.which == 2);
+                    m.button.right = (e.which == 3);
+
+                    /*
+
+                        Mac browsers and right click:
+
+                            - Safari doesn't fire any click events on a right
+                              click:
+                              http://bugs.webkit.org/show_bug.cgi?id=6595
+
+                            - Firefox fires the event, and sets ctrlKey = true
+
+                            - Opera fires the event, and sets metaKey = true
+
+                        oncontextmenu is fired on right clicks between
+                        browsers and across platforms.
+
+                    */
+
+                } else {
+                    m.button.left = !!(e.button & 1);
+                    m.button.right = !!(e.button & 2);
+                    m.button.middle = !!(e.button & 4);
+                }
+            }
+            this._mouse = m;
+            return m;
+        }
+        return undefined;
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.stop */
+    stop: function () {
+        this.stopPropagation();
+        this.preventDefault();
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.stopPropagation */
+    stopPropagation: function () {
+        if (this._event.stopPropagation) {
+            this._event.stopPropagation();
+        } else {
+            this._event.cancelBubble = true;
+        }
+    },
+
+    /** @id MochiKit.Signal.Event.prototype.preventDefault */
+    preventDefault: function () {
+        if (this._event.preventDefault) {
+            this._event.preventDefault();
+        } else if (this._confirmUnload === null) {
+            this._event.returnValue = false;
+        }
+    },
+
+    _confirmUnload: null,
+
+    /** @id MochiKit.Signal.Event.prototype.confirmUnload */
+    confirmUnload: function (msg) {
+        if (this.type() == 'beforeunload') {
+            this._confirmUnload = msg;
+            this._event.returnValue = msg;
+        }
+    }
+});
+
+/* Safari sets keyCode to these special values onkeypress. */
+MochiKit.Signal._specialMacKeys = {
+    3: 'KEY_ENTER',
+    63289: 'KEY_NUM_PAD_CLEAR',
+    63276: 'KEY_PAGE_UP',
+    63277: 'KEY_PAGE_DOWN',
+    63275: 'KEY_END',
+    63273: 'KEY_HOME',
+    63234: 'KEY_ARROW_LEFT',
+    63232: 'KEY_ARROW_UP',
+    63235: 'KEY_ARROW_RIGHT',
+    63233: 'KEY_ARROW_DOWN',
+    63302: 'KEY_INSERT',
+    63272: 'KEY_DELETE'
+};
+
+/* for KEY_F1 - KEY_F12 */
+(function () {
+    var _specialMacKeys = MochiKit.Signal._specialMacKeys;
+    for (i = 63236; i <= 63242; i++) {
+        // no F0
+        _specialMacKeys[i] = 'KEY_F' + (i - 63236 + 1);
+    }
+})();
+
+/* Standard keyboard key codes. */
+MochiKit.Signal._specialKeys = {
+    8: 'KEY_BACKSPACE',
+    9: 'KEY_TAB',
+    12: 'KEY_NUM_PAD_CLEAR', // weird, for Safari and Mac FF only
+    13: 'KEY_ENTER',
+    16: 'KEY_SHIFT',
+    17: 'KEY_CTRL',
+    18: 'KEY_ALT',
+    19: 'KEY_PAUSE',
+    20: 'KEY_CAPS_LOCK',
+    27: 'KEY_ESCAPE',
+    32: 'KEY_SPACEBAR',
+    33: 'KEY_PAGE_UP',
+    34: 'KEY_PAGE_DOWN',
+    35: 'KEY_END',
+    36: 'KEY_HOME',
+    37: 'KEY_ARROW_LEFT',
+    38: 'KEY_ARROW_UP',
+    39: 'KEY_ARROW_RIGHT',
+    40: 'KEY_ARROW_DOWN',
+    44: 'KEY_PRINT_SCREEN',
+    45: 'KEY_INSERT',
+    46: 'KEY_DELETE',
+    59: 'KEY_SEMICOLON', // weird, for Safari and IE only
+    91: 'KEY_WINDOWS_LEFT',
+    92: 'KEY_WINDOWS_RIGHT',
+    93: 'KEY_SELECT',
+    106: 'KEY_NUM_PAD_ASTERISK',
+    107: 'KEY_NUM_PAD_PLUS_SIGN',
+    109: 'KEY_NUM_PAD_HYPHEN-MINUS',
+    110: 'KEY_NUM_PAD_FULL_STOP',
+    111: 'KEY_NUM_PAD_SOLIDUS',
+    144: 'KEY_NUM_LOCK',
+    145: 'KEY_SCROLL_LOCK',
+    186: 'KEY_SEMICOLON',
+    187: 'KEY_EQUALS_SIGN',
+    188: 'KEY_COMMA',
+    189: 'KEY_HYPHEN-MINUS',
+    190: 'KEY_FULL_STOP',
+    191: 'KEY_SOLIDUS',
+    192: 'KEY_GRAVE_ACCENT',
+    219: 'KEY_LEFT_SQUARE_BRACKET',
+    220: 'KEY_REVERSE_SOLIDUS',
+    221: 'KEY_RIGHT_SQUARE_BRACKET',
+    222: 'KEY_APOSTROPHE'
+    // undefined: 'KEY_UNKNOWN'
+};
+
+(function () {
+    /* for KEY_0 - KEY_9 */
+    var _specialKeys = MochiKit.Signal._specialKeys;
+    for (var i = 48; i <= 57; i++) {
+        _specialKeys[i] = 'KEY_' + (i - 48);
+    }
+
+    /* for KEY_A - KEY_Z */
+    for (i = 65; i <= 90; i++) {
+        _specialKeys[i] = 'KEY_' + String.fromCharCode(i);
+    }
+
+    /* for KEY_NUM_PAD_0 - KEY_NUM_PAD_9 */
+    for (i = 96; i <= 105; i++) {
+        _specialKeys[i] = 'KEY_NUM_PAD_' + (i - 96);
+    }
+
+    /* for KEY_F1 - KEY_F12 */
+    for (i = 112; i <= 123; i++) {
+        // no F0
+        _specialKeys[i] = 'KEY_F' + (i - 112 + 1);
+    }
+})();
+
+/* Internal object to keep track of created signals. */
+MochiKit.Signal.Ident = function (ident) {
+    this.source = ident.source;
+    this.signal = ident.signal;
+    this.listener = ident.listener;
+    this.isDOM = ident.isDOM;
+    this.objOrFunc = ident.objOrFunc;
+    this.funcOrStr = ident.funcOrStr;
+    this.connected = ident.connected;
+};
+
+MochiKit.Signal.Ident.prototype = {};
+
+MochiKit.Base.update(MochiKit.Signal, {
+
+    __repr__: function () {
+        return '[' + this.NAME + ' ' + this.VERSION + ']';
+    },
+
+    toString: function () {
+        return this.__repr__();
+    },
+
+    _unloadCache: function () {
+        var self = MochiKit.Signal;
+        var observers = self._observers;
+
+        for (var i = 0; i < observers.length; i++) {
+            if (observers[i].signal !== 'onload' && observers[i].signal !== 'onunload') {
+                self._disconnect(observers[i]);
+            }
+        }
+    },
+
+    _listener: function (src, sig, func, obj, isDOM) {
+        var self = MochiKit.Signal;
+        var E = self.Event;
+        if (!isDOM) {
+            /* We don't want to re-bind already bound methods */
+            if (typeof(func.im_self) == 'undefined') {
+                return MochiKit.Base.bind(func, obj);
+            } else {
+                return func;
+            }
+        }
+        obj = obj || src;
+        if (typeof(func) == "string") {
+            if (sig === 'onload' || sig === 'onunload') {
+                return function (nativeEvent) {
+                    obj[func].apply(obj, [new E(src, nativeEvent)]);
+                    
+                    var ident = new MochiKit.Signal.Ident({
+                        source: src, signal: sig, objOrFunc: obj, funcOrStr: func});
+                    
+                    MochiKit.Signal._disconnect(ident);
+                };
+            } else {
+                return function (nativeEvent) {
+                    obj[func].apply(obj, [new E(src, nativeEvent)]);
+                };
+            }
+        } else {
+            if (sig === 'onload' || sig === 'onunload') {
+                return function (nativeEvent) {
+                    func.apply(obj, [new E(src, nativeEvent)]);
+                    
+                    var ident = new MochiKit.Signal.Ident({
+                        source: src, signal: sig, objOrFunc: func});
+                    
+                    MochiKit.Signal._disconnect(ident);
+                };
+            } else {
+                return function (nativeEvent) {
+                    func.apply(obj, [new E(src, nativeEvent)]);
+                };
+            }
+        }
+    },
+
+    _browserAlreadyHasMouseEnterAndLeave: function () {
+        return /MSIE/.test(navigator.userAgent);
+    },
+
+    _mouseEnterListener: function (src, sig, func, obj) {
+        var E = MochiKit.Signal.Event;
+        return function (nativeEvent) {
+            var e = new E(src, nativeEvent);
+            try {
+                e.relatedTarget().nodeName;
+            } catch (err) {
+                /* probably hit a permission denied error; possibly one of
+                 * firefox's screwy anonymous DIVs inside an input element.
+                 * Allow this event to propogate up.
+                 */
+                return;
+            }
+            e.stop();
+            if (MochiKit.DOM.isChildNode(e.relatedTarget(), src)) {
+                /* We've moved between our node and a child. Ignore. */
+                return;
+            }
+            e.type = function () { return sig; };
+            if (typeof(func) == "string") {
+                return obj[func].apply(obj, [e]);
+            } else {
+                return func.apply(obj, [e]);
+            }
+        };
+    },
+
+    _getDestPair: function (objOrFunc, funcOrStr) {
+        var obj = null;
+        var func = null;
+        if (typeof(funcOrStr) != 'undefined') {
+            obj = objOrFunc;
+            func = funcOrStr;
+            if (typeof(funcOrStr) == 'string') {
+                if (typeof(objOrFunc[funcOrStr]) != "function") {
+                    throw new Error("'funcOrStr' must be a function on 'objOrFunc'");
+                }
+            } else if (typeof(funcOrStr) != 'function') {
+                throw new Error("'funcOrStr' must be a function or string");
+            }
+        } else if (typeof(objOrFunc) != "function") {
+            throw new Error("'objOrFunc' must be a function if 'funcOrStr' is not given");
+        } else {
+            func = objOrFunc;
+        }
+        return [obj, func];
+    },
+
+    /** @id MochiKit.Signal.connect */
+    connect: function (src, sig, objOrFunc/* optional */, funcOrStr) {
+        src = MochiKit.DOM.getElement(src);
+        var self = MochiKit.Signal;
+
+        if (typeof(sig) != 'string') {
+            throw new Error("'sig' must be a string");
+        }
+
+        var destPair = self._getDestPair(objOrFunc, funcOrStr);
+        var obj = destPair[0];
+        var func = destPair[1];
+        if (typeof(obj) == 'undefined' || obj === null) {
+            obj = src;
+        }
+
+        var isDOM = !!(src.addEventListener || src.attachEvent);
+        if (isDOM && (sig === "onmouseenter" || sig === "onmouseleave")
+                  && !self._browserAlreadyHasMouseEnterAndLeave()) {
+            var listener = self._mouseEnterListener(src, sig.substr(2), func, obj);
+            if (sig === "onmouseenter") {
+                sig = "onmouseover";
+            } else {
+                sig = "onmouseout";
+            }
+        } else {
+            var listener = self._listener(src, sig, func, obj, isDOM);
+        }
+
+        if (src.addEventListener) {
+            src.addEventListener(sig.substr(2), listener, false);
+        } else if (src.attachEvent) {
+            src.attachEvent(sig, listener); // useCapture unsupported
+        }
+
+        var ident = new MochiKit.Signal.Ident({
+            source: src, 
+            signal: sig, 
+            listener: listener, 
+            isDOM: isDOM, 
+            objOrFunc: objOrFunc, 
+            funcOrStr: funcOrStr, 
+            connected: true
+        });
+        self._observers.push(ident);
+
+        if (!isDOM && typeof(src.__connect__) == 'function') {
+            var args = MochiKit.Base.extend([ident], arguments, 1);
+            src.__connect__.apply(src, args);
+        }
+
+        return ident;
+    },
+
+    _disconnect: function (ident) {
+        // already disconnected
+        if (!ident.connected) {
+            return;
+        }
+        ident.connected = false;
+        // check isDOM
+        if (!ident.isDOM) {
+            return;
+        }
+        var src = ident.source;
+        var sig = ident.signal;
+        var listener = ident.listener;
+
+        if (src.removeEventListener) {
+            src.removeEventListener(sig.substr(2), listener, false);
+        } else if (src.detachEvent) {
+            src.detachEvent(sig, listener); // useCapture unsupported
+        } else {
+            throw new Error("'src' must be a DOM element");
+        }
+    },
+
+     /** @id MochiKit.Signal.disconnect */
+    disconnect: function (ident) {
+        var self = MochiKit.Signal;
+        var observers = self._observers;
+        var m = MochiKit.Base;
+        if (arguments.length > 1) {
+            // compatibility API
+            var src = MochiKit.DOM.getElement(arguments[0]);
+            var sig = arguments[1];
+            var obj = arguments[2];
+            var func = arguments[3];
+            for (var i = observers.length - 1; i >= 0; i--) {
+                var o = observers[i];
+                if (o.source === src && o.signal === sig && o.objOrFunc === obj && o.funcOrStr === func) {
+                    self._disconnect(o);
+                    if (!self._lock) {
+                        observers.splice(i, 1);
+                    } else {
+                        self._dirty = true;
+                    }
+                    return true;
+                }
+            }
+        } else {
+            var idx = m.findIdentical(observers, ident);
+            if (idx >= 0) {
+                self._disconnect(ident);
+                if (!self._lock) {
+                    observers.splice(idx, 1);
+                } else {
+                    self._dirty = true;
+                }
+                return true;
+            }
+        }
+        return false;
+    },
+
+    /** @id MochiKit.Signal.disconnectAllTo */
+    disconnectAllTo: function (objOrFunc, /* optional */funcOrStr) {
+        var self = MochiKit.Signal;
+        var observers = self._observers;
+        var disconnect = self._disconnect;
+        var locked = self._lock;
+        var dirty = self._dirty;
+        if (typeof(funcOrStr) === 'undefined') {
+            funcOrStr = null;
+        }
+        for (var i = observers.length - 1; i >= 0; i--) {
+            var ident = observers[i];
+            if (ident.objOrFunc === objOrFunc &&
+                    (funcOrStr === null || ident.funcOrStr === funcOrStr)) {
+                disconnect(ident);
+                if (locked) {
+                    dirty = true;
+                } else {
+                    observers.splice(i, 1);
+                }
+            }
+        }
+        self._dirty = dirty;
+    },
+
+    /** @id MochiKit.Signal.disconnectAll */
+    disconnectAll: function (src/* optional */, sig) {
+        src = MochiKit.DOM.getElement(src);
+        var m = MochiKit.Base;
+        var signals = m.flattenArguments(m.extend(null, arguments, 1));
+        var self = MochiKit.Signal;
+        var disconnect = self._disconnect;
+        var observers = self._observers;
+        var i, ident;
+        var locked = self._lock;
+        var dirty = self._dirty;
+        if (signals.length === 0) {
+            // disconnect all
+            for (i = observers.length - 1; i >= 0; i--) {
+                ident = observers[i];
+                if (ident.source === src) {
+                    disconnect(ident);
+                    if (!locked) {
+                        observers.splice(i, 1);
+                    } else {
+                        dirty = true;
+                    }
+                }
+            }
+        } else {
+            var sigs = {};
+            for (i = 0; i < signals.length; i++) {
+                sigs[signals[i]] = true;
+            }
+            for (i = observers.length - 1; i >= 0; i--) {
+                ident = observers[i];
+                if (ident.source === src && ident.signal in sigs) {
+                    disconnect(ident);
+                    if (!locked) {
+                        observers.splice(i, 1);
+                    } else {
+                        dirty = true;
+                    }
+                }
+            }
+        }
+        self._dirty = dirty;
+    },
+
+    /** @id MochiKit.Signal.signal */
+    signal: function (src, sig) {
+        var self = MochiKit.Signal;
+        var observers = self._observers;
+        src = MochiKit.DOM.getElement(src);
+        var args = MochiKit.Base.extend(null, arguments, 2);
+        var errors = [];
+        self._lock = true;
+        for (var i = 0; i < observers.length; i++) {
+            var ident = observers[i];
+            if (ident.source === src && ident.signal === sig &&
+                    ident.connected) {
+                try {
+                    ident.listener.apply(src, args);
+                } catch (e) {
+                    errors.push(e);
+                }
+            }
+        }
+        self._lock = false;
+        if (self._dirty) {
+            self._dirty = false;
+            for (var i = observers.length - 1; i >= 0; i--) {
+                if (!observers[i].connected) {
+                    observers.splice(i, 1);
+                }
+            }
+        }
+        if (errors.length == 1) {
+            throw errors[0];
+        } else if (errors.length > 1) {
+            var e = new Error("Multiple errors thrown in handling 'sig', see errors property");
+            e.errors = errors;
+            throw e;
+        }
+    }
+
+});
+
+MochiKit.Signal.EXPORT_OK = [];
+
+MochiKit.Signal.EXPORT = [
+    'connect',
+    'disconnect',
+    'signal',
+    'disconnectAll',
+    'disconnectAllTo'
+];
+
+MochiKit.Signal.__new__ = function (win) {
+    var m = MochiKit.Base;
+    this._document = document;
+    this._window = win;
+    this._lock = false;
+    this._dirty = false;
+
+    try {
+        this.connect(window, 'onunload', this._unloadCache);
+    } catch (e) {
+        // pass: might not be a browser
+    }
+
+    this.EXPORT_TAGS = {
+        ':common': this.EXPORT,
+        ':all': m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+};
+
+MochiKit.Signal.__new__(this);
+
+//
+// XXX: Internet Explorer blows
+//
+if (MochiKit.__export__) {
+    connect = MochiKit.Signal.connect;
+    disconnect = MochiKit.Signal.disconnect;
+    disconnectAll = MochiKit.Signal.disconnectAll;
+    signal = MochiKit.Signal.signal;
+}
+
+MochiKit.Base._exportSymbols(this, MochiKit.Signal);
diff --git a/IPython/external/external/MochiKit/Sortable.js b/IPython/external/external/MochiKit/Sortable.js
new file mode 100644
index 0000000..8976ec0
--- /dev/null
+++ b/IPython/external/external/MochiKit/Sortable.js
@@ -0,0 +1,589 @@
+/***
+Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+    Mochi-ized By Thomas Herve (_firstname_@nimail.org)
+
+See scriptaculous.js for full license.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Sortable');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Iter');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+    JSAN.use("MochiKit.DOM", []);
+    JSAN.use("MochiKit.Iter", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined' ||
+        typeof(MochiKit.DOM) == 'undefined' ||
+        typeof(MochiKit.Iter) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.DragAndDrop depends on MochiKit.Base, MochiKit.DOM and MochiKit.Iter!";
+}
+
+if (typeof(MochiKit.Sortable) == 'undefined') {
+    MochiKit.Sortable = {};
+}
+
+MochiKit.Sortable.NAME = 'MochiKit.Sortable';
+MochiKit.Sortable.VERSION = '1.4';
+
+MochiKit.Sortable.__repr__ = function () {
+    return '[' + this.NAME + ' ' + this.VERSION + ']';
+};
+
+MochiKit.Sortable.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Sortable.EXPORT = [
+];
+
+MochiKit.Sortable.EXPORT_OK = [
+];
+
+MochiKit.Base.update(MochiKit.Sortable, {
+    /***
+
+    Manage sortables. Mainly use the create function to add a sortable.
+
+    ***/
+    sortables: {},
+
+    _findRootElement: function (element) {
+        while (element.tagName.toUpperCase() != "BODY") {
+            if (element.id && MochiKit.Sortable.sortables[element.id]) {
+                return element;
+            }
+            element = element.parentNode;
+        }
+    },
+
+    /** @id MochiKit.Sortable.options */
+    options: function (element) {
+        element = MochiKit.Sortable._findRootElement(MochiKit.DOM.getElement(element));
+        if (!element) {
+            return;
+        }
+        return MochiKit.Sortable.sortables[element.id];
+    },
+
+    /** @id MochiKit.Sortable.destroy */
+    destroy: function (element){
+        var s = MochiKit.Sortable.options(element);
+        var b = MochiKit.Base;
+        var d = MochiKit.DragAndDrop;
+
+        if (s) {
+            MochiKit.Signal.disconnect(s.startHandle);
+            MochiKit.Signal.disconnect(s.endHandle);
+            b.map(function (dr) {
+                d.Droppables.remove(dr);
+            }, s.droppables);
+            b.map(function (dr) {
+                dr.destroy();
+            }, s.draggables);
+
+            delete MochiKit.Sortable.sortables[s.element.id];
+        }
+    },
+
+    /** @id MochiKit.Sortable.create */
+    create: function (element, options) {
+        element = MochiKit.DOM.getElement(element);
+        var self = MochiKit.Sortable;
+
+        /** @id MochiKit.Sortable.options */
+        options = MochiKit.Base.update({
+
+            /** @id MochiKit.Sortable.element */
+            element: element,
+
+            /** @id MochiKit.Sortable.tag */
+            tag: 'li',  // assumes li children, override with tag: 'tagname'
+
+            /** @id MochiKit.Sortable.dropOnEmpty */
+            dropOnEmpty: false,
+
+            /** @id MochiKit.Sortable.tree */
+            tree: false,
+
+            /** @id MochiKit.Sortable.treeTag */
+            treeTag: 'ul',
+
+            /** @id MochiKit.Sortable.overlap */
+            overlap: 'vertical',  // one of 'vertical', 'horizontal'
+
+            /** @id MochiKit.Sortable.constraint */
+            constraint: 'vertical',  // one of 'vertical', 'horizontal', false
+            // also takes array of elements (or ids); or false
+
+            /** @id MochiKit.Sortable.containment */
+            containment: [element],
+
+            /** @id MochiKit.Sortable.handle */
+            handle: false,  // or a CSS class
+
+            /** @id MochiKit.Sortable.only */
+            only: false,
+
+            /** @id MochiKit.Sortable.hoverclass */
+            hoverclass: null,
+
+            /** @id MochiKit.Sortable.ghosting */
+            ghosting: false,
+
+            /** @id MochiKit.Sortable.scroll */
+            scroll: false,
+
+            /** @id MochiKit.Sortable.scrollSensitivity */
+            scrollSensitivity: 20,
+
+            /** @id MochiKit.Sortable.scrollSpeed */
+            scrollSpeed: 15,
+
+            /** @id MochiKit.Sortable.format */
+            format: /^[^_]*_(.*)$/,
+
+            /** @id MochiKit.Sortable.onChange */
+            onChange: MochiKit.Base.noop,
+
+            /** @id MochiKit.Sortable.onUpdate */
+            onUpdate: MochiKit.Base.noop,
+
+            /** @id MochiKit.Sortable.accept */
+            accept: null
+        }, options);
+
+        // clear any old sortable with same element
+        self.destroy(element);
+
+        // build options for the draggables
+        var options_for_draggable = {
+            revert: true,
+            ghosting: options.ghosting,
+            scroll: options.scroll,
+            scrollSensitivity: options.scrollSensitivity,
+            scrollSpeed: options.scrollSpeed,
+            constraint: options.constraint,
+            handle: options.handle
+        };
+
+        if (options.starteffect) {
+            options_for_draggable.starteffect = options.starteffect;
+        }
+
+        if (options.reverteffect) {
+            options_for_draggable.reverteffect = options.reverteffect;
+        } else if (options.ghosting) {
+            options_for_draggable.reverteffect = function (innerelement) {
+                innerelement.style.top = 0;
+                innerelement.style.left = 0;
+            };
+        }
+
+        if (options.endeffect) {
+            options_for_draggable.endeffect = options.endeffect;
+        }
+
+        if (options.zindex) {
+            options_for_draggable.zindex = options.zindex;
+        }
+
+        // build options for the droppables
+        var options_for_droppable = {
+            overlap: options.overlap,
+            containment: options.containment,
+            hoverclass: options.hoverclass,
+            onhover: self.onHover,
+            tree: options.tree,
+            accept: options.accept
+        }
+
+        var options_for_tree = {
+            onhover: self.onEmptyHover,
+            overlap: options.overlap,
+            containment: options.containment,
+            hoverclass: options.hoverclass,
+            accept: options.accept
+        }
+
+        // fix for gecko engine
+        MochiKit.DOM.removeEmptyTextNodes(element);
+
+        options.draggables = [];
+        options.droppables = [];
+
+        // drop on empty handling
+        if (options.dropOnEmpty || options.tree) {
+            new MochiKit.DragAndDrop.Droppable(element, options_for_tree);
+            options.droppables.push(element);
+        }
+        MochiKit.Base.map(function (e) {
+            // handles are per-draggable
+            var handle = options.handle ?
+                MochiKit.DOM.getFirstElementByTagAndClassName(null,
+                    options.handle, e) : e;
+            options.draggables.push(
+                new MochiKit.DragAndDrop.Draggable(e,
+                    MochiKit.Base.update(options_for_draggable,
+                                         {handle: handle})));
+            new MochiKit.DragAndDrop.Droppable(e, options_for_droppable);
+            if (options.tree) {
+                e.treeNode = element;
+            }
+            options.droppables.push(e);
+        }, (self.findElements(element, options) || []));
+
+        if (options.tree) {
+            MochiKit.Base.map(function (e) {
+                new MochiKit.DragAndDrop.Droppable(e, options_for_tree);
+                e.treeNode = element;
+                options.droppables.push(e);
+            }, (self.findTreeElements(element, options) || []));
+        }
+
+        // keep reference
+        self.sortables[element.id] = options;
+
+        options.lastValue = self.serialize(element);
+        options.startHandle = MochiKit.Signal.connect(MochiKit.DragAndDrop.Draggables, 'start',
+                                MochiKit.Base.partial(self.onStart, element));
+        options.endHandle = MochiKit.Signal.connect(MochiKit.DragAndDrop.Draggables, 'end',
+                                MochiKit.Base.partial(self.onEnd, element));
+    },
+
+    /** @id MochiKit.Sortable.onStart */
+    onStart: function (element, draggable) {
+        var self = MochiKit.Sortable;
+        var options = self.options(element);
+        options.lastValue = self.serialize(options.element);
+    },
+
+    /** @id MochiKit.Sortable.onEnd */
+    onEnd: function (element, draggable) {
+        var self = MochiKit.Sortable;
+        self.unmark();
+        var options = self.options(element);
+        if (options.lastValue != self.serialize(options.element)) {
+            options.onUpdate(options.element);
+        }
+    },
+
+    // return all suitable-for-sortable elements in a guaranteed order
+
+    /** @id MochiKit.Sortable.findElements */
+    findElements: function (element, options) {
+        return MochiKit.Sortable.findChildren(
+            element, options.only, options.tree ? true : false, options.tag);
+    },
+
+    /** @id MochiKit.Sortable.findTreeElements */
+    findTreeElements: function (element, options) {
+        return MochiKit.Sortable.findChildren(
+            element, options.only, options.tree ? true : false, options.treeTag);
+    },
+
+    /** @id MochiKit.Sortable.findChildren */
+    findChildren: function (element, only, recursive, tagName) {
+        if (!element.hasChildNodes()) {
+            return null;
+        }
+        tagName = tagName.toUpperCase();
+        if (only) {
+            only = MochiKit.Base.flattenArray([only]);
+        }
+        var elements = [];
+        MochiKit.Base.map(function (e) {
+            if (e.tagName &&
+                e.tagName.toUpperCase() == tagName &&
+               (!only ||
+                MochiKit.Iter.some(only, function (c) {
+                    return MochiKit.DOM.hasElementClass(e, c);
+                }))) {
+                elements.push(e);
+            }
+            if (recursive) {
+                var grandchildren = MochiKit.Sortable.findChildren(e, only, recursive, tagName);
+                if (grandchildren && grandchildren.length > 0) {
+                    elements = elements.concat(grandchildren);
+                }
+            }
+        }, element.childNodes);
+        return elements;
+    },
+
+    /** @id MochiKit.Sortable.onHover */
+    onHover: function (element, dropon, overlap) {
+        if (MochiKit.DOM.isParent(dropon, element)) {
+            return;
+        }
+        var self = MochiKit.Sortable;
+
+        if (overlap > .33 && overlap < .66 && self.options(dropon).tree) {
+            return;
+        } else if (overlap > 0.5) {
+            self.mark(dropon, 'before');
+            if (dropon.previousSibling != element) {
+                var oldParentNode = element.parentNode;
+                element.style.visibility = 'hidden';  // fix gecko rendering
+                dropon.parentNode.insertBefore(element, dropon);
+                if (dropon.parentNode != oldParentNode) {
+                    self.options(oldParentNode).onChange(element);
+                }
+                self.options(dropon.parentNode).onChange(element);
+            }
+        } else {
+            self.mark(dropon, 'after');
+            var nextElement = dropon.nextSibling || null;
+            if (nextElement != element) {
+                var oldParentNode = element.parentNode;
+                element.style.visibility = 'hidden';  // fix gecko rendering
+                dropon.parentNode.insertBefore(element, nextElement);
+                if (dropon.parentNode != oldParentNode) {
+                    self.options(oldParentNode).onChange(element);
+                }
+                self.options(dropon.parentNode).onChange(element);
+            }
+        }
+    },
+
+    _offsetSize: function (element, type) {
+        if (type == 'vertical' || type == 'height') {
+            return element.offsetHeight;
+        } else {
+            return element.offsetWidth;
+        }
+    },
+
+    /** @id MochiKit.Sortable.onEmptyHover */
+    onEmptyHover: function (element, dropon, overlap) {
+        var oldParentNode = element.parentNode;
+        var self = MochiKit.Sortable;
+        var droponOptions = self.options(dropon);
+
+        if (!MochiKit.DOM.isParent(dropon, element)) {
+            var index;
+
+            var children = self.findElements(dropon, {tag: droponOptions.tag,
+                                                      only: droponOptions.only});
+            var child = null;
+
+            if (children) {
+                var offset = self._offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+
+                for (index = 0; index < children.length; index += 1) {
+                    if (offset - self._offsetSize(children[index], droponOptions.overlap) >= 0) {
+                        offset -= self._offsetSize(children[index], droponOptions.overlap);
+                    } else if (offset - (self._offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+                        child = index + 1 < children.length ? children[index + 1] : null;
+                        break;
+                    } else {
+                        child = children[index];
+                        break;
+                    }
+                }
+            }
+
+            dropon.insertBefore(element, child);
+
+            self.options(oldParentNode).onChange(element);
+            droponOptions.onChange(element);
+        }
+    },
+
+    /** @id MochiKit.Sortable.unmark */
+    unmark: function () {
+        var m = MochiKit.Sortable._marker;
+        if (m) {
+            MochiKit.Style.hideElement(m);
+        }
+    },
+
+    /** @id MochiKit.Sortable.mark */
+    mark: function (dropon, position) {
+        // mark on ghosting only
+        var d = MochiKit.DOM;
+        var self = MochiKit.Sortable;
+        var sortable = self.options(dropon.parentNode);
+        if (sortable && !sortable.ghosting) {
+            return;
+        }
+
+        if (!self._marker) {
+            self._marker = d.getElement('dropmarker') ||
+                        document.createElement('DIV');
+            MochiKit.Style.hideElement(self._marker);
+            d.addElementClass(self._marker, 'dropmarker');
+            self._marker.style.position = 'absolute';
+            document.getElementsByTagName('body').item(0).appendChild(self._marker);
+        }
+        var offsets = MochiKit.Position.cumulativeOffset(dropon);
+        self._marker.style.left = offsets.x + 'px';
+        self._marker.style.top = offsets.y + 'px';
+
+        if (position == 'after') {
+            if (sortable.overlap == 'horizontal') {
+                self._marker.style.left = (offsets.x + dropon.clientWidth) + 'px';
+            } else {
+                self._marker.style.top = (offsets.y + dropon.clientHeight) + 'px';
+            }
+        }
+        MochiKit.Style.showElement(self._marker);
+    },
+
+    _tree: function (element, options, parent) {
+        var self = MochiKit.Sortable;
+        var children = self.findElements(element, options) || [];
+
+        for (var i = 0; i < children.length; ++i) {
+            var match = children[i].id.match(options.format);
+
+            if (!match) {
+                continue;
+            }
+
+            var child = {
+                id: encodeURIComponent(match ? match[1] : null),
+                element: element,
+                parent: parent,
+                children: [],
+                position: parent.children.length,
+                container: self._findChildrenElement(children[i], options.treeTag.toUpperCase())
+            }
+
+            /* Get the element containing the children and recurse over it */
+            if (child.container) {
+                self._tree(child.container, options, child)
+            }
+
+            parent.children.push (child);
+        }
+
+        return parent;
+    },
+
+    /* Finds the first element of the given tag type within a parent element.
+       Used for finding the first LI[ST] within a L[IST]I[TEM].*/
+    _findChildrenElement: function (element, containerTag) {
+        if (element && element.hasChildNodes) {
+            containerTag = containerTag.toUpperCase();
+            for (var i = 0; i < element.childNodes.length; ++i) {
+                if (element.childNodes[i].tagName.toUpperCase() == containerTag) {
+                    return element.childNodes[i];
+                }
+            }
+        }
+        return null;
+    },
+
+    /** @id MochiKit.Sortable.tree */
+    tree: function (element, options) {
+        element = MochiKit.DOM.getElement(element);
+        var sortableOptions = MochiKit.Sortable.options(element);
+        options = MochiKit.Base.update({
+            tag: sortableOptions.tag,
+            treeTag: sortableOptions.treeTag,
+            only: sortableOptions.only,
+            name: element.id,
+            format: sortableOptions.format
+        }, options || {});
+
+        var root = {
+            id: null,
+            parent: null,
+            children: new Array,
+            container: element,
+            position: 0
+        }
+
+        return MochiKit.Sortable._tree(element, options, root);
+    },
+
+    /**
+     * Specifies the sequence for the Sortable.
+     * @param {Node} element    Element to use as the Sortable.
+     * @param {Object} newSequence    New sequence to use.
+     * @param {Object} options    Options to use fro the Sortable.
+     */
+    setSequence: function (element, newSequence, options) {
+        var self = MochiKit.Sortable;
+        var b = MochiKit.Base;
+        element = MochiKit.DOM.getElement(element);
+        options = b.update(self.options(element), options || {});
+
+        var nodeMap = {};
+        b.map(function (n) {
+            var m = n.id.match(options.format);
+            if (m) {
+                nodeMap[m[1]] = [n, n.parentNode];
+            }
+            n.parentNode.removeChild(n);
+        }, self.findElements(element, options));
+
+        b.map(function (ident) {
+            var n = nodeMap[ident];
+            if (n) {
+                n[1].appendChild(n[0]);
+                delete nodeMap[ident];
+            }
+        }, newSequence);
+    },
+
+    /* Construct a [i] index for a particular node */
+    _constructIndex: function (node) {
+        var index = '';
+        do {
+            if (node.id) {
+                index = '[' + node.position + ']' + index;
+            }
+        } while ((node = node.parent) != null);
+        return index;
+    },
+
+    /** @id MochiKit.Sortable.sequence */
+    sequence: function (element, options) {
+        element = MochiKit.DOM.getElement(element);
+        var self = MochiKit.Sortable;
+        var options = MochiKit.Base.update(self.options(element), options || {});
+
+        return MochiKit.Base.map(function (item) {
+            return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+        }, MochiKit.DOM.getElement(self.findElements(element, options) || []));
+    },
+
+    /**
+     * Serializes the content of a Sortable. Useful to send this content through a XMLHTTPRequest.
+     * These options override the Sortable options for the serialization only.
+     * @param {Node} element    Element to serialize.
+     * @param {Object} options    Serialization options.
+     */
+    serialize: function (element, options) {
+        element = MochiKit.DOM.getElement(element);
+        var self = MochiKit.Sortable;
+        options = MochiKit.Base.update(self.options(element), options || {});
+        var name = encodeURIComponent(options.name || element.id);
+
+        if (options.tree) {
+            return MochiKit.Base.flattenArray(MochiKit.Base.map(function (item) {
+                return [name + self._constructIndex(item) + "[id]=" +
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+            }, self.tree(element, options).children)).join('&');
+        } else {
+            return MochiKit.Base.map(function (item) {
+                return name + "[]=" + encodeURIComponent(item);
+            }, self.sequence(element, options)).join('&');
+        }
+    }
+});
+
+// trunk compatibility
+MochiKit.Sortable.Sortable = MochiKit.Sortable;
diff --git a/IPython/external/external/MochiKit/Style.js b/IPython/external/external/MochiKit/Style.js
new file mode 100644
index 0000000..93e7786
--- /dev/null
+++ b/IPython/external/external/MochiKit/Style.js
@@ -0,0 +1,445 @@
+/***
+
+MochiKit.Style 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005-2006 Bob Ippolito, Beau Hartshorne.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Style');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+}
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use('MochiKit.Base', []);
+    JSAN.use('MochiKit.DOM', []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Style depends on MochiKit.Base!';
+}
+
+try {
+    if (typeof(MochiKit.DOM) == 'undefined') {
+        throw '';
+    }
+} catch (e) {
+    throw 'MochiKit.Style depends on MochiKit.DOM!';
+}
+
+
+if (typeof(MochiKit.Style) == 'undefined') {
+    MochiKit.Style = {};
+}
+
+MochiKit.Style.NAME = 'MochiKit.Style';
+MochiKit.Style.VERSION = '1.4';
+MochiKit.Style.__repr__ = function () {
+    return '[' + this.NAME + ' ' + this.VERSION + ']';
+};
+MochiKit.Style.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Style.EXPORT_OK = [];
+
+MochiKit.Style.EXPORT = [
+    'setStyle',
+    'setOpacity',
+    'getStyle',
+    'getElementDimensions',
+    'elementDimensions', // deprecated
+    'setElementDimensions',
+    'getElementPosition',
+    'elementPosition', // deprecated
+    'setElementPosition',
+    'setDisplayForElement',
+    'hideElement',
+    'showElement',
+    'getViewportDimensions',
+    'getViewportPosition',
+    'Dimensions',
+    'Coordinates'
+];
+
+
+/*
+
+    Dimensions
+
+*/
+/** @id MochiKit.Style.Dimensions */
+MochiKit.Style.Dimensions = function (w, h) {
+    this.w = w;
+    this.h = h;
+};
+
+MochiKit.Style.Dimensions.prototype.__repr__ = function () {
+    var repr = MochiKit.Base.repr;
+    return '{w: '  + repr(this.w) + ', h: ' + repr(this.h) + '}';
+};
+
+MochiKit.Style.Dimensions.prototype.toString = function () {
+    return this.__repr__();
+};
+
+
+/*
+
+    Coordinates
+
+*/
+/** @id MochiKit.Style.Coordinates */
+MochiKit.Style.Coordinates = function (x, y) {
+    this.x = x;
+    this.y = y;
+};
+
+MochiKit.Style.Coordinates.prototype.__repr__ = function () {
+    var repr = MochiKit.Base.repr;
+    return '{x: '  + repr(this.x) + ', y: ' + repr(this.y) + '}';
+};
+
+MochiKit.Style.Coordinates.prototype.toString = function () {
+    return this.__repr__();
+};
+
+
+MochiKit.Base.update(MochiKit.Style, {
+
+    /** @id MochiKit.Style.getStyle */
+    getStyle: function (elem, cssProperty) {
+        var dom = MochiKit.DOM;
+        var d = dom._document;
+
+        elem = dom.getElement(elem);
+        cssProperty = MochiKit.Base.camelize(cssProperty);
+
+        if (!elem || elem == d) {
+            return undefined;
+        }
+        if (cssProperty == 'opacity' && elem.filters) {
+            var opacity = (MochiKit.Style.getStyle(elem, 'filter') || '').match(/alpha\(opacity=(.*)\)/);
+            if (opacity && opacity[1]) {
+                return parseFloat(opacity[1]) / 100;
+            }
+            return 1.0;
+        }
+        var value = elem.style ? elem.style[cssProperty] : null;
+        if (!value) {
+            if (d.defaultView && d.defaultView.getComputedStyle) {
+                var css = d.defaultView.getComputedStyle(elem, null);
+                cssProperty = cssProperty.replace(/([A-Z])/g, '-$1'
+                    ).toLowerCase(); // from dojo.style.toSelectorCase
+                value = css ? css.getPropertyValue(cssProperty) : null;
+            } else if (elem.currentStyle) {
+                value = elem.currentStyle[cssProperty];
+            }
+        }
+        if (cssProperty == 'opacity') {
+            value = parseFloat(value);
+        }
+
+        if (/Opera/.test(navigator.userAgent) && (MochiKit.Base.find(['left', 'top', 'right', 'bottom'], cssProperty) != -1)) {
+            if (MochiKit.Style.getStyle(elem, 'position') == 'static') {
+                value = 'auto';
+            }
+        }
+
+        return value == 'auto' ? null : value;
+    },
+
+    /** @id MochiKit.Style.setStyle */
+    setStyle: function (elem, style) {
+        elem = MochiKit.DOM.getElement(elem);
+        for (var name in style) {
+            if (name == 'opacity') {
+                MochiKit.Style.setOpacity(elem, style[name]);
+            } else {
+                elem.style[MochiKit.Base.camelize(name)] = style[name];
+            }
+        }
+    },
+
+    /** @id MochiKit.Style.setOpacity */
+    setOpacity: function (elem, o) {
+        elem = MochiKit.DOM.getElement(elem);
+        var self = MochiKit.Style;
+        if (o == 1) {
+            var toSet = /Gecko/.test(navigator.userAgent) && !(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent));
+            elem.style["opacity"] = toSet ? 0.999999 : 1.0;
+            if (/MSIE/.test(navigator.userAgent)) {
+                elem.style['filter'] =
+                    self.getStyle(elem, 'filter').replace(/alpha\([^\)]*\)/gi, '');
+            }
+        } else {
+            if (o < 0.00001) {
+                o = 0;
+            }
+            elem.style["opacity"] = o;
+            if (/MSIE/.test(navigator.userAgent)) {
+                elem.style['filter'] =
+                    self.getStyle(elem, 'filter').replace(/alpha\([^\)]*\)/gi, '') + 'alpha(opacity=' + o * 100 + ')';
+            }
+        }
+    },
+
+    /*
+
+        getElementPosition is adapted from YAHOO.util.Dom.getXY v0.9.0.
+        Copyright: Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+        License: BSD, http://developer.yahoo.net/yui/license.txt
+
+    */
+
+    /** @id MochiKit.Style.getElementPosition */
+    getElementPosition: function (elem, /* optional */relativeTo) {
+        var self = MochiKit.Style;
+        var dom = MochiKit.DOM;
+        elem = dom.getElement(elem);
+
+        if (!elem ||
+            (!(elem.x && elem.y) &&
+            (!elem.parentNode === null ||
+            self.getStyle(elem, 'display') == 'none'))) {
+            return undefined;
+        }
+
+        var c = new self.Coordinates(0, 0);
+        var box = null;
+        var parent = null;
+
+        var d = MochiKit.DOM._document;
+        var de = d.documentElement;
+        var b = d.body;
+
+        if (!elem.parentNode && elem.x && elem.y) {
+            /* it's just a MochiKit.Style.Coordinates object */
+            c.x += elem.x || 0;
+            c.y += elem.y || 0;
+        } else if (elem.getBoundingClientRect) { // IE shortcut
+            /*
+
+                The IE shortcut can be off by two. We fix it. See:
+                http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/getboundingclientrect.asp
+
+                This is similar to the method used in
+                MochiKit.Signal.Event.mouse().
+
+            */
+            box = elem.getBoundingClientRect();
+
+            c.x += box.left +
+                (de.scrollLeft || b.scrollLeft) -
+                (de.clientLeft || 0);
+
+            c.y += box.top +
+                (de.scrollTop || b.scrollTop) -
+                (de.clientTop || 0);
+
+        } else if (elem.offsetParent) {
+            c.x += elem.offsetLeft;
+            c.y += elem.offsetTop;
+            parent = elem.offsetParent;
+
+            if (parent != elem) {
+                while (parent) {
+                    c.x += parent.offsetLeft;
+                    c.y += parent.offsetTop;
+                    parent = parent.offsetParent;
+                }
+            }
+
+            /*
+
+                Opera < 9 and old Safari (absolute) incorrectly account for
+                body offsetTop and offsetLeft.
+
+            */
+            var ua = navigator.userAgent.toLowerCase();
+            if ((typeof(opera) != 'undefined' &&
+                parseFloat(opera.version()) < 9) ||
+                (ua.indexOf('AppleWebKit') != -1 &&
+                self.getStyle(elem, 'position') == 'absolute')) {
+
+                c.x -= b.offsetLeft;
+                c.y -= b.offsetTop;
+
+            }
+        }
+
+        if (typeof(relativeTo) != 'undefined') {
+            relativeTo = arguments.callee(relativeTo);
+            if (relativeTo) {
+                c.x -= (relativeTo.x || 0);
+                c.y -= (relativeTo.y || 0);
+            }
+        }
+
+        if (elem.parentNode) {
+            parent = elem.parentNode;
+        } else {
+            parent = null;
+        }
+
+        while (parent) {
+            var tagName = parent.tagName.toUpperCase();
+            if (tagName === 'BODY' || tagName === 'HTML') {
+                break;
+            }
+            var disp = self.getStyle(parent, 'display');
+            // Handle strange Opera bug for some display
+            if (disp != 'inline' && disp != 'table-row') {
+                c.x -= parent.scrollLeft;
+                c.y -= parent.scrollTop;
+            }
+            if (parent.parentNode) {
+                parent = parent.parentNode;
+            } else {
+                parent = null;
+            }
+        }
+
+        return c;
+    },
+
+    /** @id MochiKit.Style.setElementPosition */
+    setElementPosition: function (elem, newPos/* optional */, units) {
+        elem = MochiKit.DOM.getElement(elem);
+        if (typeof(units) == 'undefined') {
+            units = 'px';
+        }
+        var newStyle = {};
+        var isUndefNull = MochiKit.Base.isUndefinedOrNull;
+        if (!isUndefNull(newPos.x)) {
+            newStyle['left'] = newPos.x + units;
+        }
+        if (!isUndefNull(newPos.y)) {
+            newStyle['top'] = newPos.y + units;
+        }
+        MochiKit.DOM.updateNodeAttributes(elem, {'style': newStyle});
+    },
+
+    /** @id MochiKit.Style.getElementDimensions */
+    getElementDimensions: function (elem) {
+        var self = MochiKit.Style;
+        var dom = MochiKit.DOM;
+        if (typeof(elem.w) == 'number' || typeof(elem.h) == 'number') {
+            return new self.Dimensions(elem.w || 0, elem.h || 0);
+        }
+        elem = dom.getElement(elem);
+        if (!elem) {
+            return undefined;
+        }
+        var disp = self.getStyle(elem, 'display');
+        // display can be empty/undefined on WebKit/KHTML
+        if (disp != 'none' && disp !== '' && typeof(disp) != 'undefined') {
+            return new self.Dimensions(elem.offsetWidth || 0,
+                elem.offsetHeight || 0);
+        }
+        var s = elem.style;
+        var originalVisibility = s.visibility;
+        var originalPosition = s.position;
+        s.visibility = 'hidden';
+        s.position = 'absolute';
+        s.display = '';
+        var originalWidth = elem.offsetWidth;
+        var originalHeight = elem.offsetHeight;
+        s.display = 'none';
+        s.position = originalPosition;
+        s.visibility = originalVisibility;
+        return new self.Dimensions(originalWidth, originalHeight);
+    },
+
+    /** @id MochiKit.Style.setElementDimensions */
+    setElementDimensions: function (elem, newSize/* optional */, units) {
+        elem = MochiKit.DOM.getElement(elem);
+        if (typeof(units) == 'undefined') {
+            units = 'px';
+        }
+        var newStyle = {};
+        var isUndefNull = MochiKit.Base.isUndefinedOrNull;
+        if (!isUndefNull(newSize.w)) {
+            newStyle['width'] = newSize.w + units;
+        }
+        if (!isUndefNull(newSize.h)) {
+            newStyle['height'] = newSize.h + units;
+        }
+        MochiKit.DOM.updateNodeAttributes(elem, {'style': newStyle});
+    },
+
+    /** @id MochiKit.Style.setDisplayForElement */
+    setDisplayForElement: function (display, element/*, ...*/) {
+        var elements = MochiKit.Base.extend(null, arguments, 1);
+        var getElement = MochiKit.DOM.getElement;
+        for (var i = 0; i < elements.length; i++) {
+            element = getElement(elements[i]);
+            if (element) {
+                element.style.display = display;
+            }
+        }
+    },
+
+    /** @id MochiKit.Style.getViewportDimensions */
+    getViewportDimensions: function () {
+        var d = new MochiKit.Style.Dimensions();
+
+        var w = MochiKit.DOM._window;
+        var b = MochiKit.DOM._document.body;
+
+        if (w.innerWidth) {
+            d.w = w.innerWidth;
+            d.h = w.innerHeight;
+        } else if (b.parentElement.clientWidth) {
+            d.w = b.parentElement.clientWidth;
+            d.h = b.parentElement.clientHeight;
+        } else if (b && b.clientWidth) {
+            d.w = b.clientWidth;
+            d.h = b.clientHeight;
+        }
+        return d;
+    },
+
+    /** @id MochiKit.Style.getViewportPosition */
+    getViewportPosition: function () {
+        var c = new MochiKit.Style.Coordinates(0, 0);
+        var d = MochiKit.DOM._document;
+        var de = d.documentElement;
+        var db = d.body;
+        if (de && (de.scrollTop || de.scrollLeft)) {
+            c.x = de.scrollLeft;
+            c.y = de.scrollTop;
+        } else if (db) {
+            c.x = db.scrollLeft;
+            c.y = db.scrollTop;
+        }
+        return c;
+    },
+
+    __new__: function () {
+        var m = MochiKit.Base;
+
+        this.elementPosition = this.getElementPosition;
+        this.elementDimensions = this.getElementDimensions;
+
+        this.hideElement = m.partial(this.setDisplayForElement, 'none');
+        this.showElement = m.partial(this.setDisplayForElement, 'block');
+
+        this.EXPORT_TAGS = {
+            ':common': this.EXPORT,
+            ':all': m.concat(this.EXPORT, this.EXPORT_OK)
+        };
+
+        m.nameFunctions(this);
+    }
+});
+
+MochiKit.Style.__new__();
+MochiKit.Base._exportSymbols(this, MochiKit.Style);
diff --git a/IPython/external/external/MochiKit/Test.js b/IPython/external/external/MochiKit/Test.js
new file mode 100644
index 0000000..494a5b4
--- /dev/null
+++ b/IPython/external/external/MochiKit/Test.js
@@ -0,0 +1,181 @@
+/***
+
+MochiKit.Test 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Test');
+    dojo.require('MochiKit.Base');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) == 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Test depends on MochiKit.Base!";
+}
+
+if (typeof(MochiKit.Test) == 'undefined') {
+    MochiKit.Test = {};
+}
+
+MochiKit.Test.NAME = "MochiKit.Test";
+MochiKit.Test.VERSION = "1.4";
+MochiKit.Test.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.Test.toString = function () {
+    return this.__repr__();
+};
+
+
+MochiKit.Test.EXPORT = ["runTests"];
+MochiKit.Test.EXPORT_OK = [];
+
+MochiKit.Test.runTests = function (obj) {
+    if (typeof(obj) == "string") {
+        obj = JSAN.use(obj);
+    }
+    var suite = new MochiKit.Test.Suite();
+    suite.run(obj);
+};
+
+MochiKit.Test.Suite = function () {
+    this.testIndex = 0;
+    MochiKit.Base.bindMethods(this);
+};
+
+MochiKit.Test.Suite.prototype = {
+    run: function (obj) {
+        try {
+            obj(this);
+        } catch (e) {
+            this.traceback(e);
+        }
+    },
+    traceback: function (e) {
+        var items = MochiKit.Iter.sorted(MochiKit.Base.items(e));
+        print("not ok " + this.testIndex + " - Error thrown");
+        for (var i = 0; i < items.length; i++) {
+            var kv = items[i];
+            if (kv[0] == "stack") {
+                kv[1] = kv[1].split(/\n/)[0];
+            }
+            this.print("# " + kv.join(": "));
+        }
+    },
+    print: function (s) {
+        print(s);
+    },
+    is: function (got, expected, /* optional */message) {
+        var res = 1;
+        var msg = null;
+        try {
+            res = MochiKit.Base.compare(got, expected);
+        } catch (e) {
+            msg = "Can not compare " + typeof(got) + ":" + typeof(expected);
+        }
+        if (res) {
+            msg = "Expected value did not compare equal";
+        }
+        if (!res) {
+            return this.testResult(true, message);
+        }
+        return this.testResult(false, message,
+            [[msg], ["got:", got], ["expected:", expected]]);
+    },
+
+    testResult: function (pass, msg, failures) {
+        this.testIndex += 1;
+        if (pass) {
+            this.print("ok " + this.testIndex + " - " + msg);
+            return;
+        }
+        this.print("not ok " + this.testIndex + " - " + msg);
+        if (failures) {
+            for (var i = 0; i < failures.length; i++) {
+                this.print("# " + failures[i].join(" "));
+            }
+        }
+    },
+
+    isDeeply: function (got, expected, /* optional */message) {
+        var m = MochiKit.Base;
+        var res = 1;
+        try {
+            res = m.compare(got, expected);
+        } catch (e) {
+            // pass
+        }
+        if (res === 0) {
+            return this.ok(true, message);
+        }
+        var gk = m.keys(got);
+        var ek = m.keys(expected);
+        gk.sort();
+        ek.sort();
+        if (m.compare(gk, ek)) {
+            // differing keys
+            var cmp = {};
+            var i;
+            for (i = 0; i < gk.length; i++) {
+                cmp[gk[i]] = "got";
+            }
+            for (i = 0; i < ek.length; i++) {
+                if (ek[i] in cmp) {
+                    delete cmp[ek[i]];
+                } else {
+                    cmp[ek[i]] = "expected";
+                }
+            }
+            var diffkeys = m.keys(cmp);
+            diffkeys.sort();
+            var gotkeys = [];
+            var expkeys = [];
+            while (diffkeys.length) {
+                var k = diffkeys.shift();
+                if (k in Object.prototype) {
+                    continue;
+                }
+                (cmp[k] == "got" ? gotkeys : expkeys).push(k);
+            }
+
+
+        }
+
+        return this.testResult((!res), msg,
+            (msg ? [["got:", got], ["expected:", expected]] : undefined)
+        );
+    },
+
+    ok: function (res, message) {
+        return this.testResult(res, message);
+    }
+};
+
+MochiKit.Test.__new__ = function () {
+    var m = MochiKit.Base;
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+    m.nameFunctions(this);
+
+};
+
+MochiKit.Test.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Test);
diff --git a/IPython/external/external/MochiKit/Visual.js b/IPython/external/external/MochiKit/Visual.js
new file mode 100644
index 0000000..e9924c8
--- /dev/null
+++ b/IPython/external/external/MochiKit/Visual.js
@@ -0,0 +1,1981 @@
+/***
+
+MochiKit.Visual 1.4
+
+See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+(c) 2005 Bob Ippolito and others.  All rights Reserved.
+
+***/
+
+if (typeof(dojo) != 'undefined') {
+    dojo.provide('MochiKit.Visual');
+    dojo.require('MochiKit.Base');
+    dojo.require('MochiKit.DOM');
+    dojo.require('MochiKit.Style');
+    dojo.require('MochiKit.Color');
+    dojo.require('MochiKit.Position');
+}
+
+if (typeof(JSAN) != 'undefined') {
+    JSAN.use("MochiKit.Base", []);
+    JSAN.use("MochiKit.DOM", []);
+    JSAN.use("MochiKit.Style", []);
+    JSAN.use("MochiKit.Color", []);
+    JSAN.use("MochiKit.Position", []);
+}
+
+try {
+    if (typeof(MochiKit.Base) === 'undefined' ||
+        typeof(MochiKit.DOM) === 'undefined' ||
+        typeof(MochiKit.Style) === 'undefined' ||
+        typeof(MochiKit.Position) === 'undefined' ||
+        typeof(MochiKit.Color) === 'undefined') {
+        throw "";
+    }
+} catch (e) {
+    throw "MochiKit.Visual depends on MochiKit.Base, MochiKit.DOM, MochiKit.Style, MochiKit.Position and MochiKit.Color!";
+}
+
+if (typeof(MochiKit.Visual) == "undefined") {
+    MochiKit.Visual = {};
+}
+
+MochiKit.Visual.NAME = "MochiKit.Visual";
+MochiKit.Visual.VERSION = "1.4";
+
+MochiKit.Visual.__repr__ = function () {
+    return "[" + this.NAME + " " + this.VERSION + "]";
+};
+
+MochiKit.Visual.toString = function () {
+    return this.__repr__();
+};
+
+MochiKit.Visual._RoundCorners = function (e, options) {
+    e = MochiKit.DOM.getElement(e);
+    this._setOptions(options);
+    if (this.options.__unstable__wrapElement) {
+        e = this._doWrap(e);
+    }
+
+    var color = this.options.color;
+    var C = MochiKit.Color.Color;
+    if (this.options.color === "fromElement") {
+        color = C.fromBackground(e);
+    } else if (!(color instanceof C)) {
+        color = C.fromString(color);
+    }
+    this.isTransparent = (color.asRGB().a <= 0);
+
+    var bgColor = this.options.bgColor;
+    if (this.options.bgColor === "fromParent") {
+        bgColor = C.fromBackground(e.offsetParent);
+    } else if (!(bgColor instanceof C)) {
+        bgColor = C.fromString(bgColor);
+    }
+
+    this._roundCornersImpl(e, color, bgColor);
+};
+
+MochiKit.Visual._RoundCorners.prototype = {
+    _doWrap: function (e) {
+        var parent = e.parentNode;
+        var doc = MochiKit.DOM.currentDocument();
+        if (typeof(doc.defaultView) === "undefined"
+            || doc.defaultView === null) {
+            return e;
+        }
+        var style = doc.defaultView.getComputedStyle(e, null);
+        if (typeof(style) === "undefined" || style === null) {
+            return e;
+        }
+        var wrapper = MochiKit.DOM.DIV({"style": {
+            display: "block",
+            // convert padding to margin
+            marginTop: style.getPropertyValue("padding-top"),
+            marginRight: style.getPropertyValue("padding-right"),
+            marginBottom: style.getPropertyValue("padding-bottom"),
+            marginLeft: style.getPropertyValue("padding-left"),
+            // remove padding so the rounding looks right
+            padding: "0px"
+            /*
+            paddingRight: "0px",
+            paddingLeft: "0px"
+            */
+        }});
+        wrapper.innerHTML = e.innerHTML;
+        e.innerHTML = "";
+        e.appendChild(wrapper);
+        return e;
+    },
+
+    _roundCornersImpl: function (e, color, bgColor) {
+        if (this.options.border) {
+            this._renderBorder(e, bgColor);
+        }
+        if (this._isTopRounded()) {
+            this._roundTopCorners(e, color, bgColor);
+        }
+        if (this._isBottomRounded()) {
+            this._roundBottomCorners(e, color, bgColor);
+        }
+    },
+
+    _renderBorder: function (el, bgColor) {
+        var borderValue = "1px solid " + this._borderColor(bgColor);
+        var borderL = "border-left: "  + borderValue;
+        var borderR = "border-right: " + borderValue;
+        var style = "style='" + borderL + ";" + borderR +  "'";
+        el.innerHTML = "<div " + style + ">" + el.innerHTML + "</div>";
+    },
+
+    _roundTopCorners: function (el, color, bgColor) {
+        var corner = this._createCorner(bgColor);
+        for (var i = 0; i < this.options.numSlices; i++) {
+            corner.appendChild(
+                this._createCornerSlice(color, bgColor, i, "top")
+            );
+        }
+        el.style.paddingTop = 0;
+        el.insertBefore(corner, el.firstChild);
+    },
+
+    _roundBottomCorners: function (el, color, bgColor) {
+        var corner = this._createCorner(bgColor);
+        for (var i = (this.options.numSlices - 1); i >= 0; i--) {
+            corner.appendChild(
+                this._createCornerSlice(color, bgColor, i, "bottom")
+            );
+        }
+        el.style.paddingBottom = 0;
+        el.appendChild(corner);
+    },
+
+    _createCorner: function (bgColor) {
+        var dom = MochiKit.DOM;
+        return dom.DIV({style: {backgroundColor: bgColor.toString()}});
+    },
+
+    _createCornerSlice: function (color, bgColor, n, position) {
+        var slice = MochiKit.DOM.SPAN();
+
+        var inStyle = slice.style;
+        inStyle.backgroundColor = color.toString();
+        inStyle.display = "block";
+        inStyle.height = "1px";
+        inStyle.overflow = "hidden";
+        inStyle.fontSize = "1px";
+
+        var borderColor = this._borderColor(color, bgColor);
+        if (this.options.border && n === 0) {
+            inStyle.borderTopStyle = "solid";
+            inStyle.borderTopWidth = "1px";
+            inStyle.borderLeftWidth = "0px";
+            inStyle.borderRightWidth = "0px";
+            inStyle.borderBottomWidth = "0px";
+            // assumes css compliant box model
+            inStyle.height = "0px";
+            inStyle.borderColor = borderColor.toString();
+        } else if (borderColor) {
+            inStyle.borderColor = borderColor.toString();
+            inStyle.borderStyle = "solid";
+            inStyle.borderWidth = "0px 1px";
+        }
+
+        if (!this.options.compact && (n == (this.options.numSlices - 1))) {
+            inStyle.height = "2px";
+        }
+
+        this._setMargin(slice, n, position);
+        this._setBorder(slice, n, position);
+
+        return slice;
+    },
+
+    _setOptions: function (options) {
+        this.options = {
+            corners: "all",
+            color: "fromElement",
+            bgColor: "fromParent",
+            blend: true,
+            border: false,
+            compact: false,
+            __unstable__wrapElement: false
+        };
+        MochiKit.Base.update(this.options, options);
+
+        this.options.numSlices = (this.options.compact ? 2 : 4);
+    },
+
+    _whichSideTop: function () {
+        var corners = this.options.corners;
+        if (this._hasString(corners, "all", "top")) {
+            return "";
+        }
+
+        var has_tl = (corners.indexOf("tl") != -1);
+        var has_tr = (corners.indexOf("tr") != -1);
+        if (has_tl && has_tr) {
+            return "";
+        }
+        if (has_tl) {
+            return "left";
+        }
+        if (has_tr) {
+            return "right";
+        }
+        return "";
+    },
+
+    _whichSideBottom: function () {
+        var corners = this.options.corners;
+        if (this._hasString(corners, "all", "bottom")) {
+            return "";
+        }
+
+        var has_bl = (corners.indexOf('bl') != -1);
+        var has_br = (corners.indexOf('br') != -1);
+        if (has_bl && has_br) {
+            return "";
+        }
+        if (has_bl) {
+            return "left";
+        }
+        if (has_br) {
+            return "right";
+        }
+        return "";
+    },
+
+    _borderColor: function (color, bgColor) {
+        if (color == "transparent") {
+            return bgColor;
+        } else if (this.options.border) {
+            return this.options.border;
+        } else if (this.options.blend) {
+            return bgColor.blendedColor(color);
+        }
+        return "";
+    },
+
+
+    _setMargin: function (el, n, corners) {
+        var marginSize = this._marginSize(n) + "px";
+        var whichSide = (
+            corners == "top" ? this._whichSideTop() : this._whichSideBottom()
+        );
+        var style = el.style;
+
+        if (whichSide == "left") {
+            style.marginLeft = marginSize;
+            style.marginRight = "0px";
+        } else if (whichSide == "right") {
+            style.marginRight = marginSize;
+            style.marginLeft = "0px";
+        } else {
+            style.marginLeft = marginSize;
+            style.marginRight = marginSize;
+        }
+    },
+
+    _setBorder: function (el, n, corners) {
+        var borderSize = this._borderSize(n) + "px";
+        var whichSide = (
+            corners == "top" ? this._whichSideTop() : this._whichSideBottom()
+        );
+
+        var style = el.style;
+        if (whichSide == "left") {
+            style.borderLeftWidth = borderSize;
+            style.borderRightWidth = "0px";
+        } else if (whichSide == "right") {
+            style.borderRightWidth = borderSize;
+            style.borderLeftWidth = "0px";
+        } else {
+            style.borderLeftWidth = borderSize;
+            style.borderRightWidth = borderSize;
+        }
+    },
+
+    _marginSize: function (n) {
+        if (this.isTransparent) {
+            return 0;
+        }
+
+        var o = this.options;
+        if (o.compact && o.blend) {
+            var smBlendedMarginSizes = [1, 0];
+            return smBlendedMarginSizes[n];
+        } else if (o.compact) {
+            var compactMarginSizes = [2, 1];
+            return compactMarginSizes[n];
+        } else if (o.blend) {
+            var blendedMarginSizes = [3, 2, 1, 0];
+            return blendedMarginSizes[n];
+        } else {
+            var marginSizes = [5, 3, 2, 1];
+            return marginSizes[n];
+        }
+    },
+
+    _borderSize: function (n) {
+        var o = this.options;
+        var borderSizes;
+        if (o.compact && (o.blend || this.isTransparent)) {
+            return 1;
+        } else if (o.compact) {
+            borderSizes = [1, 0];
+        } else if (o.blend) {
+            borderSizes = [2, 1, 1, 1];
+        } else if (o.border) {
+            borderSizes = [0, 2, 0, 0];
+        } else if (this.isTransparent) {
+            borderSizes = [5, 3, 2, 1];
+        } else {
+            return 0;
+        }
+        return borderSizes[n];
+    },
+
+    _hasString: function (str) {
+        for (var i = 1; i< arguments.length; i++) {
+            if (str.indexOf(arguments[i]) != -1) {
+                return true;
+            }
+        }
+        return false;
+    },
+
+    _isTopRounded: function () {
+        return this._hasString(this.options.corners,
+            "all", "top", "tl", "tr"
+        );
+    },
+
+    _isBottomRounded: function () {
+        return this._hasString(this.options.corners,
+            "all", "bottom", "bl", "br"
+        );
+    },
+
+    _hasSingleTextChild: function (el) {
+        return (el.childNodes.length == 1 && el.childNodes[0].nodeType == 3);
+    }
+};
+
+/** @id MochiKit.Visual.roundElement */
+MochiKit.Visual.roundElement = function (e, options) {
+    new MochiKit.Visual._RoundCorners(e, options);
+};
+
+/** @id MochiKit.Visual.roundClass */
+MochiKit.Visual.roundClass = function (tagName, className, options) {
+    var elements = MochiKit.DOM.getElementsByTagAndClassName(
+        tagName, className
+    );
+    for (var i = 0; i < elements.length; i++) {
+        MochiKit.Visual.roundElement(elements[i], options);
+    }
+};
+
+/** @id MochiKit.Visual.tagifyText */
+MochiKit.Visual.tagifyText = function (element, /* optional */tagifyStyle) {
+    /***
+
+    Change a node text to character in tags.
+
+    @param tagifyStyle: the style to apply to character nodes, default to
+    'position: relative'.
+
+    ***/
+    tagifyStyle = tagifyStyle || 'position:relative';
+    if (/MSIE/.test(navigator.userAgent)) {
+        tagifyStyle += ';zoom:1';
+    }
+    element = MochiKit.DOM.getElement(element);
+    var ma = MochiKit.Base.map;
+    ma(function (child) {
+        if (child.nodeType == 3) {
+            ma(function (character) {
+                element.insertBefore(
+                    MochiKit.DOM.SPAN({style: tagifyStyle},
+                        character == ' ' ? String.fromCharCode(160) : character), child);
+            }, child.nodeValue.split(''));
+            MochiKit.DOM.removeElement(child);
+        }
+    }, element.childNodes);
+};
+
+/** @id MochiKit.Visual.forceRerendering */
+MochiKit.Visual.forceRerendering = function (element) {
+    try {
+        element = MochiKit.DOM.getElement(element);
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+    } catch(e) {
+    }
+};
+
+/** @id MochiKit.Visual.multiple */
+MochiKit.Visual.multiple = function (elements, effect, /* optional */options) {
+    /***
+
+    Launch the same effect subsequently on given elements.
+
+    ***/
+    options = MochiKit.Base.update({
+        speed: 0.1, delay: 0.0
+    }, options);
+    var masterDelay = options.delay;
+    var index = 0;
+    MochiKit.Base.map(function (innerelement) {
+        options.delay = index * options.speed + masterDelay;
+        new effect(innerelement, options);
+        index += 1;
+    }, elements);
+};
+
+MochiKit.Visual.PAIRS = {
+    'slide': ['slideDown', 'slideUp'],
+    'blind': ['blindDown', 'blindUp'],
+    'appear': ['appear', 'fade'],
+    'size': ['grow', 'shrink']
+};
+
+/** @id MochiKit.Visual.toggle */
+MochiKit.Visual.toggle = function (element, /* optional */effect, /* optional */options) {
+    /***
+
+    Toggle an item between two state depending of its visibility, making
+    a effect between these states. Default  effect is 'appear', can be
+    'slide' or 'blind'.
+
+    ***/
+    element = MochiKit.DOM.getElement(element);
+    effect = (effect || 'appear').toLowerCase();
+    options = MochiKit.Base.update({
+        queue: {position: 'end', scope: (element.id || 'global'), limit: 1}
+    }, options);
+    var v = MochiKit.Visual;
+    v[MochiKit.Style.getStyle(element, 'display') != 'none' ?
+      v.PAIRS[effect][1] : v.PAIRS[effect][0]](element, options);
+};
+
+/***
+
+Transitions: define functions calculating variations depending of a position.
+
+***/
+
+MochiKit.Visual.Transitions = {};
+
+/** @id MochiKit.Visual.Transitions.linear */
+MochiKit.Visual.Transitions.linear = function (pos) {
+    return pos;
+};
+
+/** @id MochiKit.Visual.Transitions.sinoidal */
+MochiKit.Visual.Transitions.sinoidal = function (pos) {
+    return (-Math.cos(pos*Math.PI)/2) + 0.5;
+};
+
+/** @id MochiKit.Visual.Transitions.reverse */
+MochiKit.Visual.Transitions.reverse = function (pos) {
+    return 1 - pos;
+};
+
+/** @id MochiKit.Visual.Transitions.flicker */
+MochiKit.Visual.Transitions.flicker = function (pos) {
+    return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+};
+
+/** @id MochiKit.Visual.Transitions.wobble */
+MochiKit.Visual.Transitions.wobble = function (pos) {
+    return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+};
+
+/** @id MochiKit.Visual.Transitions.pulse */
+MochiKit.Visual.Transitions.pulse = function (pos, pulses) {
+    if (!pulses) {
+        return (Math.floor(pos*10) % 2 === 0 ?
+            (pos*10 - Math.floor(pos*10)) : 1 - (pos*10 - Math.floor(pos*10)));
+    }
+    return (Math.round((pos % (1/pulses)) * pulses) == 0 ?
+            ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) :
+        1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2)));
+};
+
+/** @id MochiKit.Visual.Transitions.none */
+MochiKit.Visual.Transitions.none = function (pos) {
+    return 0;
+};
+
+/** @id MochiKit.Visual.Transitions.full */
+MochiKit.Visual.Transitions.full = function (pos) {
+    return 1;
+};
+
+/***
+
+Core effects
+
+***/
+
+MochiKit.Visual.ScopedQueue = function () {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls();
+    }
+    this.__init__();
+};
+
+MochiKit.Base.update(MochiKit.Visual.ScopedQueue.prototype, {
+    __init__: function () {
+        this.effects = [];
+        this.interval = null;
+    },
+
+    /** @id MochiKit.Visual.ScopedQueue.prototype.add */
+    add: function (effect) {
+        var timestamp = new Date().getTime();
+
+        var position = (typeof(effect.options.queue) == 'string') ?
+            effect.options.queue : effect.options.queue.position;
+
+        var ma = MochiKit.Base.map;
+        switch (position) {
+            case 'front':
+                // move unstarted effects after this effect
+                ma(function (e) {
+                    if (e.state == 'idle') {
+                        e.startOn += effect.finishOn;
+                        e.finishOn += effect.finishOn;
+                    }
+                }, this.effects);
+                break;
+            case 'end':
+                var finish;
+                // start effect after last queued effect has finished
+                ma(function (e) {
+                    var i = e.finishOn;
+                    if (i >= (finish || i)) {
+                        finish = i;
+                    }
+                }, this.effects);
+                timestamp = finish || timestamp;
+                break;
+            case 'break':
+                ma(function (e) {
+                    e.finalize();
+                }, this.effects);
+                break;
+        }
+
+        effect.startOn += timestamp;
+        effect.finishOn += timestamp;
+        if (!effect.options.queue.limit ||
+            this.effects.length < effect.options.queue.limit) {
+            this.effects.push(effect);
+        }
+
+        if (!this.interval) {
+            this.interval = this.startLoop(MochiKit.Base.bind(this.loop, this),
+                                        40);
+        }
+    },
+
+    /** @id MochiKit.Visual.ScopedQueue.prototype.startLoop */
+    startLoop: function (func, interval) {
+        return setInterval(func, interval);
+    },
+
+    /** @id MochiKit.Visual.ScopedQueue.prototype.remove */
+    remove: function (effect) {
+        this.effects = MochiKit.Base.filter(function (e) {
+            return e != effect;
+        }, this.effects);
+        if (!this.effects.length) {
+            this.stopLoop(this.interval);
+            this.interval = null;
+        }
+    },
+
+    /** @id MochiKit.Visual.ScopedQueue.prototype.stopLoop */
+    stopLoop: function (interval) {
+        clearInterval(interval);
+    },
+
+    /** @id MochiKit.Visual.ScopedQueue.prototype.loop */
+    loop: function () {
+        var timePos = new Date().getTime();
+        MochiKit.Base.map(function (effect) {
+            effect.loop(timePos);
+        }, this.effects);
+    }
+});
+
+MochiKit.Visual.Queues = {
+    instances: {},
+
+    get: function (queueName) {
+        if (typeof(queueName) != 'string') {
+            return queueName;
+        }
+
+        if (!this.instances[queueName]) {
+            this.instances[queueName] = new MochiKit.Visual.ScopedQueue();
+        }
+        return this.instances[queueName];
+    }
+};
+
+MochiKit.Visual.Queue = MochiKit.Visual.Queues.get('global');
+
+MochiKit.Visual.DefaultOptions = {
+    transition: MochiKit.Visual.Transitions.sinoidal,
+    duration: 1.0,  // seconds
+    fps: 25.0,  // max. 25fps due to MochiKit.Visual.Queue implementation
+    sync: false,  // true for combining
+    from: 0.0,
+    to: 1.0,
+    delay: 0.0,
+    queue: 'parallel'
+};
+
+MochiKit.Visual.Base = function () {};
+
+MochiKit.Visual.Base.prototype = {
+    /***
+
+    Basic class for all Effects. Define a looping mechanism called for each step
+    of an effect. Don't instantiate it, only subclass it.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Base,
+
+    /** @id MochiKit.Visual.Base.prototype.start */
+    start: function (options) {
+        var v = MochiKit.Visual;
+        this.options = MochiKit.Base.setdefault(options,
+                                                v.DefaultOptions);
+        this.currentFrame = 0;
+        this.state = 'idle';
+        this.startOn = this.options.delay*1000;
+        this.finishOn = this.startOn + (this.options.duration*1000);
+        this.event('beforeStart');
+        if (!this.options.sync) {
+            v.Queues.get(typeof(this.options.queue) == 'string' ?
+                'global' : this.options.queue.scope).add(this);
+        }
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.loop */
+    loop: function (timePos) {
+        if (timePos >= this.startOn) {
+            if (timePos >= this.finishOn) {
+                return this.finalize();
+            }
+            var pos = (timePos - this.startOn) / (this.finishOn - this.startOn);
+            var frame =
+                Math.round(pos * this.options.fps * this.options.duration);
+            if (frame > this.currentFrame) {
+                this.render(pos);
+                this.currentFrame = frame;
+            }
+        }
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.render */
+    render: function (pos) {
+        if (this.state == 'idle') {
+            this.state = 'running';
+            this.event('beforeSetup');
+            this.setup();
+            this.event('afterSetup');
+        }
+        if (this.state == 'running') {
+            if (this.options.transition) {
+                pos = this.options.transition(pos);
+            }
+            pos *= (this.options.to - this.options.from);
+            pos += this.options.from;
+            this.event('beforeUpdate');
+            this.update(pos);
+            this.event('afterUpdate');
+        }
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.cancel */
+    cancel: function () {
+        if (!this.options.sync) {
+            MochiKit.Visual.Queues.get(typeof(this.options.queue) == 'string' ?
+                'global' : this.options.queue.scope).remove(this);
+        }
+        this.state = 'finished';
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.finalize */
+    finalize: function () {
+        this.render(1.0);
+        this.cancel();
+        this.event('beforeFinish');
+        this.finish();
+        this.event('afterFinish');
+    },
+
+    setup: function () {
+    },
+
+    finish: function () {
+    },
+
+    update: function (position) {
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.event */
+    event: function (eventName) {
+        if (this.options[eventName + 'Internal']) {
+            this.options[eventName + 'Internal'](this);
+        }
+        if (this.options[eventName]) {
+            this.options[eventName](this);
+        }
+    },
+
+    /** @id MochiKit.Visual.Base.prototype.repr */
+    repr: function () {
+        return '[' + this.__class__.NAME + ', options:' +
+               MochiKit.Base.repr(this.options) + ']';
+    }
+};
+
+    /** @id MochiKit.Visual.Parallel */
+MochiKit.Visual.Parallel = function (effects, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(effects, options);
+    }
+
+    this.__init__(effects, options);
+};
+
+MochiKit.Visual.Parallel.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Parallel.prototype, {
+    /***
+
+    Run multiple effects at the same time.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Parallel,
+
+    __init__: function (effects, options) {
+        this.effects = effects || [];
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Parallel.prototype.update */
+    update: function (position) {
+        MochiKit.Base.map(function (effect) {
+            effect.render(position);
+        }, this.effects);
+    },
+
+    /** @id MochiKit.Visual.Parallel.prototype.finish */
+    finish: function () {
+        MochiKit.Base.map(function (effect) {
+            effect.finalize();
+        }, this.effects);
+    }
+});
+
+/** @id MochiKit.Visual.Opacity */
+MochiKit.Visual.Opacity = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.Visual.Opacity.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Opacity.prototype, {
+    /***
+
+    Change the opacity of an element.
+
+    @param options: 'from' and 'to' change the starting and ending opacities.
+    Must be between 0.0 and 1.0. Default to current opacity and 1.0.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Opacity,
+
+    __init__: function (element, /* optional */options) {
+        var b = MochiKit.Base;
+        var s = MochiKit.Style;
+        this.element = MochiKit.DOM.getElement(element);
+        // make this work on IE on elements without 'layout'
+        if (this.element.currentStyle &&
+            (!this.element.currentStyle.hasLayout)) {
+            s.setStyle(this.element, {zoom: 1});
+        }
+        options = b.update({
+            from: s.getStyle(this.element, 'opacity') || 0.0,
+            to: 1.0
+        }, options);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Opacity.prototype.update */
+    update: function (position) {
+        MochiKit.Style.setStyle(this.element, {'opacity': position});
+    }
+});
+
+/**  @id MochiKit.Visual.Move.prototype */
+MochiKit.Visual.Move = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.Visual.Move.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Move.prototype, {
+    /***
+
+    Move an element between its current position to a defined position
+
+    @param options: 'x' and 'y' for final positions, default to 0, 0.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Move,
+
+    __init__: function (element, /* optional */options) {
+        this.element = MochiKit.DOM.getElement(element);
+        options = MochiKit.Base.update({
+            x: 0,
+            y: 0,
+            mode: 'relative'
+        }, options);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Move.prototype.setup */
+    setup: function () {
+        // Bug in Opera: Opera returns the 'real' position of a static element
+        // or relative element that does not have top/left explicitly set.
+        // ==> Always set top and left for position relative elements in your
+        // stylesheets (to 0 if you do not need them)
+        MochiKit.DOM.makePositioned(this.element);
+
+        var s = this.element.style;
+        var originalVisibility = s.visibility;
+        var originalDisplay = s.display;
+        if (originalDisplay == 'none') {
+            s.visibility = 'hidden';
+            s.display = '';
+        }
+
+        this.originalLeft = parseFloat(MochiKit.Style.getStyle(this.element, 'left') || '0');
+        this.originalTop = parseFloat(MochiKit.Style.getStyle(this.element, 'top') || '0');
+
+        if (this.options.mode == 'absolute') {
+            // absolute movement, so we need to calc deltaX and deltaY
+            this.options.x -= this.originalLeft;
+            this.options.y -= this.originalTop;
+        }
+        if (originalDisplay == 'none') {
+            s.visibility = originalVisibility;
+            s.display = originalDisplay;
+        }
+    },
+
+    /** @id MochiKit.Visual.Move.prototype.update */
+    update: function (position) {
+        MochiKit.Style.setStyle(this.element, {
+            left: Math.round(this.options.x * position + this.originalLeft) + 'px',
+            top: Math.round(this.options.y * position + this.originalTop) + 'px'
+        });
+    }
+});
+
+/** @id MochiKit.Visual.Scale */
+MochiKit.Visual.Scale = function (element, percent, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, percent, options);
+    }
+    this.__init__(element, percent, options);
+};
+
+MochiKit.Visual.Scale.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Scale.prototype, {
+    /***
+
+    Change the size of an element.
+
+    @param percent: final_size = percent*original_size
+
+    @param options: several options changing scale behaviour
+
+    ***/
+
+    __class__ : MochiKit.Visual.Scale,
+
+    __init__: function (element, percent, /* optional */options) {
+        this.element = MochiKit.DOM.getElement(element);
+        options = MochiKit.Base.update({
+            scaleX: true,
+            scaleY: true,
+            scaleContent: true,
+            scaleFromCenter: false,
+            scaleMode: 'box',  // 'box' or 'contents' or {} with provided values
+            scaleFrom: 100.0,
+            scaleTo: percent
+        }, options);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Scale.prototype.setup */
+    setup: function () {
+        this.restoreAfterFinish = this.options.restoreAfterFinish || false;
+        this.elementPositioning = MochiKit.Style.getStyle(this.element,
+                                                        'position');
+
+        var ma = MochiKit.Base.map;
+        var b = MochiKit.Base.bind;
+        this.originalStyle = {};
+        ma(b(function (k) {
+                this.originalStyle[k] = this.element.style[k];
+            }, this), ['top', 'left', 'width', 'height', 'fontSize']);
+
+        this.originalTop = this.element.offsetTop;
+        this.originalLeft = this.element.offsetLeft;
+
+        var fontSize = MochiKit.Style.getStyle(this.element,
+                                             'font-size') || '100%';
+        ma(b(function (fontSizeType) {
+            if (fontSize.indexOf(fontSizeType) > 0) {
+                this.fontSize = parseFloat(fontSize);
+                this.fontSizeType = fontSizeType;
+            }
+        }, this), ['em', 'px', '%']);
+
+        this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+
+        if (/^content/.test(this.options.scaleMode)) {
+            this.dims = [this.element.scrollHeight, this.element.scrollWidth];
+        } else if (this.options.scaleMode == 'box') {
+            this.dims = [this.element.offsetHeight, this.element.offsetWidth];
+        } else {
+            this.dims = [this.options.scaleMode.originalHeight,
+                         this.options.scaleMode.originalWidth];
+        }
+    },
+
+    /** @id MochiKit.Visual.Scale.prototype.update */
+    update: function (position) {
+        var currentScale = (this.options.scaleFrom/100.0) +
+                           (this.factor * position);
+        if (this.options.scaleContent && this.fontSize) {
+            MochiKit.Style.setStyle(this.element, {
+                fontSize: this.fontSize * currentScale + this.fontSizeType
+            });
+        }
+        this.setDimensions(this.dims[0] * currentScale,
+                           this.dims[1] * currentScale);
+    },
+
+    /** @id MochiKit.Visual.Scale.prototype.finish */
+    finish: function () {
+        if (this.restoreAfterFinish) {
+            MochiKit.Style.setStyle(this.element, this.originalStyle);
+        }
+    },
+
+    /** @id MochiKit.Visual.Scale.prototype.setDimensions */
+    setDimensions: function (height, width) {
+        var d = {};
+        var r = Math.round;
+        if (/MSIE/.test(navigator.userAgent)) {
+            r = Math.ceil;
+        }
+        if (this.options.scaleX) {
+            d.width = r(width) + 'px';
+        }
+        if (this.options.scaleY) {
+            d.height = r(height) + 'px';
+        }
+        if (this.options.scaleFromCenter) {
+            var topd = (height - this.dims[0])/2;
+            var leftd = (width - this.dims[1])/2;
+            if (this.elementPositioning == 'absolute') {
+                if (this.options.scaleY) {
+                    d.top = this.originalTop - topd + 'px';
+                }
+                if (this.options.scaleX) {
+                    d.left = this.originalLeft - leftd + 'px';
+                }
+            } else {
+                if (this.options.scaleY) {
+                    d.top = -topd + 'px';
+                }
+                if (this.options.scaleX) {
+                    d.left = -leftd + 'px';
+                }
+            }
+        }
+        MochiKit.Style.setStyle(this.element, d);
+    }
+});
+
+/** @id MochiKit.Visual.Highlight */
+MochiKit.Visual.Highlight = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.Visual.Highlight.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Highlight.prototype, {
+    /***
+
+    Highlight an item of the page.
+
+    @param options: 'startcolor' for choosing highlighting color, default
+    to '#ffff99'.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Highlight,
+
+    __init__: function (element, /* optional */options) {
+        this.element = MochiKit.DOM.getElement(element);
+        options = MochiKit.Base.update({
+            startcolor: '#ffff99'
+        }, options);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Highlight.prototype.setup */
+    setup: function () {
+        var b = MochiKit.Base;
+        var s = MochiKit.Style;
+        // Prevent executing on elements not in the layout flow
+        if (s.getStyle(this.element, 'display') == 'none') {
+            this.cancel();
+            return;
+        }
+        // Disable background image during the effect
+        this.oldStyle = {
+            backgroundImage: s.getStyle(this.element, 'background-image')
+        };
+        s.setStyle(this.element, {
+            backgroundImage: 'none'
+        });
+
+        if (!this.options.endcolor) {
+            this.options.endcolor =
+                MochiKit.Color.Color.fromBackground(this.element).toHexString();
+        }
+        if (b.isUndefinedOrNull(this.options.restorecolor)) {
+            this.options.restorecolor = s.getStyle(this.element,
+                                                   'background-color');
+        }
+        // init color calculations
+        this._base = b.map(b.bind(function (i) {
+            return parseInt(
+                this.options.startcolor.slice(i*2 + 1, i*2 + 3), 16);
+        }, this), [0, 1, 2]);
+        this._delta = b.map(b.bind(function (i) {
+            return parseInt(this.options.endcolor.slice(i*2 + 1, i*2 + 3), 16)
+                - this._base[i];
+        }, this), [0, 1, 2]);
+    },
+
+    /** @id MochiKit.Visual.Highlight.prototype.update */
+    update: function (position) {
+        var m = '#';
+        MochiKit.Base.map(MochiKit.Base.bind(function (i) {
+            m += MochiKit.Color.toColorPart(Math.round(this._base[i] +
+                                            this._delta[i]*position));
+        }, this), [0, 1, 2]);
+        MochiKit.Style.setStyle(this.element, {
+            backgroundColor: m
+        });
+    },
+
+    /** @id MochiKit.Visual.Highlight.prototype.finish */
+    finish: function () {
+        MochiKit.Style.setStyle(this.element,
+            MochiKit.Base.update(this.oldStyle, {
+                backgroundColor: this.options.restorecolor
+        }));
+    }
+});
+
+/** @id MochiKit.Visual.ScrollTo */
+MochiKit.Visual.ScrollTo = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.Visual.ScrollTo.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.ScrollTo.prototype, {
+    /***
+
+    Scroll to an element in the page.
+
+    ***/
+
+    __class__ : MochiKit.Visual.ScrollTo,
+
+    __init__: function (element, /* optional */options) {
+        this.element = MochiKit.DOM.getElement(element);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.ScrollTo.prototype.setup */
+    setup: function () {
+        var p = MochiKit.Position;
+        p.prepare();
+        var offsets = p.cumulativeOffset(this.element);
+        if (this.options.offset) {
+            offsets.y += this.options.offset;
+        }
+        var max;
+        if (window.innerHeight) {
+            max = window.innerHeight - window.height;
+        } else if (document.documentElement &&
+                   document.documentElement.clientHeight) {
+            max = document.documentElement.clientHeight -
+                  document.body.scrollHeight;
+        } else if (document.body) {
+            max = document.body.clientHeight - document.body.scrollHeight;
+        }
+        this.scrollStart = p.windowOffset.y;
+        this.delta = (offsets.y > max ? max : offsets.y) - this.scrollStart;
+    },
+
+    /** @id MochiKit.Visual.ScrollTo.prototype.update */
+    update: function (position) {
+        var p = MochiKit.Position;
+        p.prepare();
+        window.scrollTo(p.windowOffset.x, this.scrollStart + (position * this.delta));
+    }
+});
+
+MochiKit.Visual.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+MochiKit.Visual.Morph = function (element, options) {
+    var cls = arguments.callee;
+    if (!(this instanceof cls)) {
+        return new cls(element, options);
+    }
+    this.__init__(element, options);
+};
+
+MochiKit.Visual.Morph.prototype = new MochiKit.Visual.Base();
+
+MochiKit.Base.update(MochiKit.Visual.Morph.prototype, {
+    /***
+
+    Morph effect: make a transformation from current style to the given style,
+    automatically making a transition between the two.
+
+    ***/
+
+    __class__ : MochiKit.Visual.Morph,
+
+    __init__: function (element, /* optional */options) {
+        this.element = MochiKit.DOM.getElement(element);
+        this.start(options);
+    },
+
+    /** @id MochiKit.Visual.Morph.prototype.setup */
+    setup: function () {
+        var b = MochiKit.Base;
+        var style = this.options.style;
+        this.styleStart = {};
+        this.styleEnd = {};
+        this.units = {};
+        var value, unit;
+        for (var s in style) {
+            value = style[s];
+            s = b.camelize(s);
+            if (MochiKit.Visual.CSS_LENGTH.test(value)) {
+                var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+                value = parseFloat(components[1]);
+                unit = (components.length == 3) ? components[2] : null;
+                this.styleEnd[s] = value;
+                this.units[s] = unit;
+                value = MochiKit.Style.getStyle(this.element, s);
+                components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+                value = parseFloat(components[1]);
+                this.styleStart[s] = value;
+            } else {
+                var c = MochiKit.Color.Color;
+                value = c.fromString(value);
+                if (value) {
+                    this.units[s] = "color";
+                    this.styleEnd[s] = value.toHexString();
+                    value = MochiKit.Style.getStyle(this.element, s);
+                    this.styleStart[s] = c.fromString(value).toHexString();
+
+                    this.styleStart[s] = b.map(b.bind(function (i) {
+                        return parseInt(
+                            this.styleStart[s].slice(i*2 + 1, i*2 + 3), 16);
+                    }, this), [0, 1, 2]);
+                    this.styleEnd[s] = b.map(b.bind(function (i) {
+                        return parseInt(
+                            this.styleEnd[s].slice(i*2 + 1, i*2 + 3), 16);
+                    }, this), [0, 1, 2]);
+                }
+            }
+        }
+    },
+
+    /** @id MochiKit.Visual.Morph.prototype.update */
+    update: function (position) {
+        var value;
+        for (var s in this.styleStart) {
+            if (this.units[s] == "color") {
+                var m = '#';
+                var start = this.styleStart[s];
+                var end = this.styleEnd[s];
+                MochiKit.Base.map(MochiKit.Base.bind(function (i) {
+                    m += MochiKit.Color.toColorPart(Math.round(start[i] +
+                                                    (end[i] - start[i])*position));
+                }, this), [0, 1, 2]);
+                this.element.style[s] = m;
+            } else {
+                value = this.styleStart[s] + Math.round((this.styleEnd[s] - this.styleStart[s]) * position * 1000) / 1000 + this.units[s];
+                this.element.style[s] = value;
+            }
+        }
+    }
+});
+
+/***
+
+Combination effects.
+
+***/
+
+/** @id MochiKit.Visual.fade */
+MochiKit.Visual.fade = function (element, /* optional */ options) {
+    /***
+
+    Fade a given element: change its opacity and hide it in the end.
+
+    @param options: 'to' and 'from' to change opacity.
+
+    ***/
+    var s = MochiKit.Style;
+    var oldOpacity = s.getStyle(element, 'opacity');
+    options = MochiKit.Base.update({
+        from: s.getStyle(element, 'opacity') || 1.0,
+        to: 0.0,
+        afterFinishInternal: function (effect) {
+            if (effect.options.to !== 0) {
+                return;
+            }
+            s.hideElement(effect.element);
+            s.setStyle(effect.element, {'opacity': oldOpacity});
+        }
+    }, options);
+    return new MochiKit.Visual.Opacity(element, options);
+};
+
+/** @id MochiKit.Visual.appear */
+MochiKit.Visual.appear = function (element, /* optional */ options) {
+    /***
+
+    Make an element appear.
+
+    @param options: 'to' and 'from' to change opacity.
+
+    ***/
+    var s = MochiKit.Style;
+    var v = MochiKit.Visual;
+    options = MochiKit.Base.update({
+        from: (s.getStyle(element, 'display') == 'none' ? 0.0 :
+               s.getStyle(element, 'opacity') || 0.0),
+        to: 1.0,
+        // force Safari to render floated elements properly
+        afterFinishInternal: function (effect) {
+            v.forceRerendering(effect.element);
+        },
+        beforeSetupInternal: function (effect) {
+            s.setStyle(effect.element, {'opacity': effect.options.from});
+            s.showElement(effect.element);
+        }
+    }, options);
+    return new v.Opacity(element, options);
+};
+
+/** @id MochiKit.Visual.puff */
+MochiKit.Visual.puff = function (element, /* optional */ options) {
+    /***
+
+    'Puff' an element: grow it to double size, fading it and make it hidden.
+
+    ***/
+    var s = MochiKit.Style;
+    var v = MochiKit.Visual;
+    element = MochiKit.DOM.getElement(element);
+    var oldStyle = {
+        position: s.getStyle(element, 'position'),
+        top: element.style.top,
+        left: element.style.left,
+        width: element.style.width,
+        height: element.style.height,
+        opacity: s.getStyle(element, 'opacity')
+    };
+    options = MochiKit.Base.update({
+        beforeSetupInternal: function (effect) {
+            MochiKit.Position.absolutize(effect.effects[0].element);
+        },
+        afterFinishInternal: function (effect) {
+            s.hideElement(effect.effects[0].element);
+            s.setStyle(effect.effects[0].element, oldStyle);
+        },
+        scaleContent: true,
+        scaleFromCenter: true
+    }, options);
+    return new v.Parallel(
+        [new v.Scale(element, 200,
+            {sync: true, scaleFromCenter: options.scaleFromCenter,
+             scaleContent: options.scaleContent, restoreAfterFinish: true}),
+         new v.Opacity(element, {sync: true, to: 0.0 })],
+        options);
+};
+
+/** @id MochiKit.Visual.blindUp */
+MochiKit.Visual.blindUp = function (element, /* optional */ options) {
+    /***
+
+    Blind an element up: change its vertical size to 0.
+
+    ***/
+    var d = MochiKit.DOM;
+    element = d.getElement(element);
+    var elemClip = d.makeClipping(element);
+    options = MochiKit.Base.update({
+        scaleContent: false,
+        scaleX: false,
+        restoreAfterFinish: true,
+        afterFinishInternal: function (effect) {
+            MochiKit.Style.hideElement(effect.element);
+            d.undoClipping(effect.element, elemClip);
+        }
+    }, options);
+
+    return new MochiKit.Visual.Scale(element, 0, options);
+};
+
+/** @id MochiKit.Visual.blindDown */
+MochiKit.Visual.blindDown = function (element, /* optional */ options) {
+    /***
+
+    Blind an element down: restore its vertical size.
+
+    ***/
+    var d = MochiKit.DOM;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    var elementDimensions = s.getElementDimensions(element);
+    var elemClip;
+    options = MochiKit.Base.update({
+        scaleContent: false,
+        scaleX: false,
+        scaleFrom: 0,
+        scaleMode: {originalHeight: elementDimensions.h,
+                    originalWidth: elementDimensions.w},
+        restoreAfterFinish: true,
+        afterSetupInternal: function (effect) {
+            elemClip = d.makeClipping(effect.element);
+            s.setStyle(effect.element, {height: '0px'});
+            s.showElement(effect.element);
+        },
+        afterFinishInternal: function (effect) {
+            d.undoClipping(effect.element, elemClip);
+        }
+    }, options);
+    return new MochiKit.Visual.Scale(element, 100, options);
+};
+
+/** @id MochiKit.Visual.switchOff */
+MochiKit.Visual.switchOff = function (element, /* optional */ options) {
+    /***
+
+    Apply a switch-off-like effect.
+
+    ***/
+    var d = MochiKit.DOM;
+    element = d.getElement(element);
+    var oldOpacity = MochiKit.Style.getStyle(element, 'opacity');
+    var elemClip;
+    options = MochiKit.Base.update({
+        duration: 0.3,
+        scaleFromCenter: true,
+        scaleX: false,
+        scaleContent: false,
+        restoreAfterFinish: true,
+        beforeSetupInternal: function (effect) {
+            d.makePositioned(effect.element);
+            elemClip = d.makeClipping(effect.element);
+        },
+        afterFinishInternal: function (effect) {
+            MochiKit.Style.hideElement(effect.element);
+            d.undoClipping(effect.element, elemClip);
+            d.undoPositioned(effect.element);
+            MochiKit.Style.setStyle(effect.element, {'opacity': oldOpacity});
+        }
+    }, options);
+    var v = MochiKit.Visual;
+    return new v.appear(element, {
+        duration: 0.4,
+        from: 0,
+        transition: v.Transitions.flicker,
+        afterFinishInternal: function (effect) {
+            new v.Scale(effect.element, 1, options);
+        }
+    });
+};
+
+/** @id MochiKit.Visual.dropOut */
+MochiKit.Visual.dropOut = function (element, /* optional */ options) {
+    /***
+
+    Make an element fall and disappear.
+
+    ***/
+    var d = MochiKit.DOM;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    var oldStyle = {
+        top: s.getStyle(element, 'top'),
+        left: s.getStyle(element, 'left'),
+        opacity: s.getStyle(element, 'opacity')
+    };
+
+    options = MochiKit.Base.update({
+        duration: 0.5,
+        distance: 100,
+        beforeSetupInternal: function (effect) {
+            d.makePositioned(effect.effects[0].element);
+        },
+        afterFinishInternal: function (effect) {
+            s.hideElement(effect.effects[0].element);
+            d.undoPositioned(effect.effects[0].element);
+            s.setStyle(effect.effects[0].element, oldStyle);
+        }
+    }, options);
+    var v = MochiKit.Visual;
+    return new v.Parallel(
+        [new v.Move(element, {x: 0, y: options.distance, sync: true}),
+         new v.Opacity(element, {sync: true, to: 0.0})],
+        options);
+};
+
+/** @id MochiKit.Visual.shake */
+MochiKit.Visual.shake = function (element, /* optional */ options) {
+    /***
+
+    Move an element from left to right several times.
+
+    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    options = MochiKit.Base.update({
+        x: -20,
+        y: 0,
+        duration: 0.05,
+        afterFinishInternal: function (effect) {
+            d.undoPositioned(effect.element);
+            s.setStyle(effect.element, oldStyle);
+        }
+    }, options);
+    var oldStyle = {
+        top: s.getStyle(element, 'top'),
+        left: s.getStyle(element, 'left') };
+        return new v.Move(element,
+          {x: 20, y: 0, duration: 0.05, afterFinishInternal: function (effect) {
+        new v.Move(effect.element,
+          {x: -40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
+        new v.Move(effect.element,
+           {x: 40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
+        new v.Move(effect.element,
+          {x: -40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
+        new v.Move(effect.element,
+           {x: 40, y: 0, duration: 0.1, afterFinishInternal: function (effect) {
+        new v.Move(effect.element, options
+        ) }}) }}) }}) }}) }});
+};
+
+/** @id MochiKit.Visual.slideDown */
+MochiKit.Visual.slideDown = function (element, /* optional */ options) {
+    /***
+
+    Slide an element down.
+    It needs to have the content of the element wrapped in a container
+    element with fixed height.
+
+    ***/
+    var d = MochiKit.DOM;
+    var b = MochiKit.Base;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    if (!element.firstChild) {
+        throw "MochiKit.Visual.slideDown must be used on a element with a child";
+    }
+    d.removeEmptyTextNodes(element);
+    var oldInnerBottom = s.getStyle(element.firstChild, 'bottom') || 0;
+    var elementDimensions = s.getElementDimensions(element);
+    var elemClip;
+    options = b.update({
+        scaleContent: false,
+        scaleX: false,
+        scaleFrom: 0,
+        scaleMode: {originalHeight: elementDimensions.h,
+                    originalWidth: elementDimensions.w},
+        restoreAfterFinish: true,
+        afterSetupInternal: function (effect) {
+            d.makePositioned(effect.element);
+            d.makePositioned(effect.element.firstChild);
+            if (/Opera/.test(navigator.userAgent)) {
+                s.setStyle(effect.element, {top: ''});
+            }
+            elemClip = d.makeClipping(effect.element);
+            s.setStyle(effect.element, {height: '0px'});
+            s.showElement(effect.element);
+        },
+        afterUpdateInternal: function (effect) {
+            s.setStyle(effect.element.firstChild,
+               {bottom: (effect.dims[0] - effect.element.clientHeight) + 'px'});
+        },
+        afterFinishInternal: function (effect) {
+            d.undoClipping(effect.element, elemClip);
+            // IE will crash if child is undoPositioned first
+            if (/MSIE/.test(navigator.userAgent)) {
+                d.undoPositioned(effect.element);
+                d.undoPositioned(effect.element.firstChild);
+            } else {
+                d.undoPositioned(effect.element.firstChild);
+                d.undoPositioned(effect.element);
+            }
+            s.setStyle(effect.element.firstChild,
+                                  {bottom: oldInnerBottom});
+        }
+    }, options);
+
+    return new MochiKit.Visual.Scale(element, 100, options);
+};
+
+/** @id MochiKit.Visual.slideUp */
+MochiKit.Visual.slideUp = function (element, /* optional */ options) {
+    /***
+
+    Slide an element up.
+    It needs to have the content of the element wrapped in a container
+    element with fixed height.
+
+    ***/
+    var d = MochiKit.DOM;
+    var b = MochiKit.Base;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    if (!element.firstChild) {
+        throw "MochiKit.Visual.slideUp must be used on a element with a child";
+    }
+    d.removeEmptyTextNodes(element);
+    var oldInnerBottom = s.getStyle(element.firstChild, 'bottom');
+    var elemClip;
+    options = b.update({
+        scaleContent: false,
+        scaleX: false,
+        scaleMode: 'box',
+        scaleFrom: 100,
+        restoreAfterFinish: true,
+        beforeStartInternal: function (effect) {
+            d.makePositioned(effect.element);
+            d.makePositioned(effect.element.firstChild);
+            if (/Opera/.test(navigator.userAgent)) {
+                s.setStyle(effect.element, {top: ''});
+            }
+            elemClip = d.makeClipping(effect.element);
+            s.showElement(effect.element);
+        },
+        afterUpdateInternal: function (effect) {
+            s.setStyle(effect.element.firstChild,
+            {bottom: (effect.dims[0] - effect.element.clientHeight) + 'px'});
+        },
+        afterFinishInternal: function (effect) {
+            s.hideElement(effect.element);
+            d.undoClipping(effect.element, elemClip);
+            d.undoPositioned(effect.element.firstChild);
+            d.undoPositioned(effect.element);
+            s.setStyle(effect.element.firstChild, {bottom: oldInnerBottom});
+        }
+    }, options);
+    return new MochiKit.Visual.Scale(element, 0, options);
+};
+
+// Bug in opera makes the TD containing this element expand for a instance
+// after finish
+/** @id MochiKit.Visual.squish */
+MochiKit.Visual.squish = function (element, /* optional */ options) {
+    /***
+
+    Reduce an element and make it disappear.
+
+    ***/
+    var d = MochiKit.DOM;
+    var b = MochiKit.Base;
+    var elemClip;
+    options = b.update({
+        restoreAfterFinish: true,
+        beforeSetupInternal: function (effect) {
+            elemClip = d.makeClipping(effect.element);
+        },
+        afterFinishInternal: function (effect) {
+            MochiKit.Style.hideElement(effect.element);
+            d.undoClipping(effect.element, elemClip);
+        }
+    }, options);
+
+    return new MochiKit.Visual.Scale(element, /Opera/.test(navigator.userAgent) ? 1 : 0, options);
+};
+
+/** @id MochiKit.Visual.grow */
+MochiKit.Visual.grow = function (element, /* optional */ options) {
+    /***
+
+    Grow an element to its original size. Make it zero-sized before
+    if necessary.
+
+    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    options = MochiKit.Base.update({
+        direction: 'center',
+        moveTransition: v.Transitions.sinoidal,
+        scaleTransition: v.Transitions.sinoidal,
+        opacityTransition: v.Transitions.full,
+        scaleContent: true,
+        scaleFromCenter: false
+    }, options);
+    var oldStyle = {
+        top: element.style.top,
+        left: element.style.left,
+        height: element.style.height,
+        width: element.style.width,
+        opacity: s.getStyle(element, 'opacity')
+    };
+
+    var dims = s.getElementDimensions(element);
+    var initialMoveX, initialMoveY;
+    var moveX, moveY;
+
+    switch (options.direction) {
+        case 'top-left':
+            initialMoveX = initialMoveY = moveX = moveY = 0;
+            break;
+        case 'top-right':
+            initialMoveX = dims.w;
+            initialMoveY = moveY = 0;
+            moveX = -dims.w;
+            break;
+        case 'bottom-left':
+            initialMoveX = moveX = 0;
+            initialMoveY = dims.h;
+            moveY = -dims.h;
+            break;
+        case 'bottom-right':
+            initialMoveX = dims.w;
+            initialMoveY = dims.h;
+            moveX = -dims.w;
+            moveY = -dims.h;
+            break;
+        case 'center':
+            initialMoveX = dims.w / 2;
+            initialMoveY = dims.h / 2;
+            moveX = -dims.w / 2;
+            moveY = -dims.h / 2;
+            break;
+    }
+
+    var optionsParallel = MochiKit.Base.update({
+        beforeSetupInternal: function (effect) {
+            s.setStyle(effect.effects[0].element, {height: '0px'});
+            s.showElement(effect.effects[0].element);
+        },
+        afterFinishInternal: function (effect) {
+            d.undoClipping(effect.effects[0].element);
+            d.undoPositioned(effect.effects[0].element);
+            s.setStyle(effect.effects[0].element, oldStyle);
+        }
+    }, options);
+
+    return new v.Move(element, {
+        x: initialMoveX,
+        y: initialMoveY,
+        duration: 0.01,
+        beforeSetupInternal: function (effect) {
+            s.hideElement(effect.element);
+            d.makeClipping(effect.element);
+            d.makePositioned(effect.element);
+        },
+        afterFinishInternal: function (effect) {
+            new v.Parallel(
+                [new v.Opacity(effect.element, {
+                    sync: true, to: 1.0, from: 0.0,
+                    transition: options.opacityTransition
+                 }),
+                 new v.Move(effect.element, {
+                     x: moveX, y: moveY, sync: true,
+                     transition: options.moveTransition
+                 }),
+                 new v.Scale(effect.element, 100, {
+                        scaleMode: {originalHeight: dims.h,
+                                    originalWidth: dims.w},
+                        sync: true,
+                        scaleFrom: /Opera/.test(navigator.userAgent) ? 1 : 0,
+                        transition: options.scaleTransition,
+                        scaleContent: options.scaleContent,
+                        scaleFromCenter: options.scaleFromCenter,
+                        restoreAfterFinish: true
+                })
+                ], optionsParallel
+            );
+        }
+    });
+};
+
+/** @id MochiKit.Visual.shrink */
+MochiKit.Visual.shrink = function (element, /* optional */ options) {
+    /***
+
+    Shrink an element and make it disappear.
+
+    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    options = MochiKit.Base.update({
+        direction: 'center',
+        moveTransition: v.Transitions.sinoidal,
+        scaleTransition: v.Transitions.sinoidal,
+        opacityTransition: v.Transitions.none,
+        scaleContent: true,
+        scaleFromCenter: false
+    }, options);
+    var oldStyle = {
+        top: element.style.top,
+        left: element.style.left,
+        height: element.style.height,
+        width: element.style.width,
+        opacity: s.getStyle(element, 'opacity')
+    };
+
+    var dims = s.getElementDimensions(element);
+    var moveX, moveY;
+
+    switch (options.direction) {
+        case 'top-left':
+            moveX = moveY = 0;
+            break;
+        case 'top-right':
+            moveX = dims.w;
+            moveY = 0;
+            break;
+        case 'bottom-left':
+            moveX = 0;
+            moveY = dims.h;
+            break;
+        case 'bottom-right':
+            moveX = dims.w;
+            moveY = dims.h;
+            break;
+        case 'center':
+            moveX = dims.w / 2;
+            moveY = dims.h / 2;
+            break;
+    }
+    var elemClip;
+
+    var optionsParallel = MochiKit.Base.update({
+        beforeStartInternal: function (effect) {
+            elemClip = d.makePositioned(effect.effects[0].element);
+            d.makeClipping(effect.effects[0].element);
+        },
+        afterFinishInternal: function (effect) {
+            s.hideElement(effect.effects[0].element);
+            d.undoClipping(effect.effects[0].element, elemClip);
+            d.undoPositioned(effect.effects[0].element);
+            s.setStyle(effect.effects[0].element, oldStyle);
+        }
+    }, options);
+
+    return new v.Parallel(
+        [new v.Opacity(element, {
+            sync: true, to: 0.0, from: 1.0,
+            transition: options.opacityTransition
+         }),
+         new v.Scale(element, /Opera/.test(navigator.userAgent) ? 1 : 0, {
+             sync: true, transition: options.scaleTransition,
+             scaleContent: options.scaleContent,
+             scaleFromCenter: options.scaleFromCenter,
+             restoreAfterFinish: true
+         }),
+         new v.Move(element, {
+             x: moveX, y: moveY, sync: true, transition: options.moveTransition
+         })
+        ], optionsParallel
+    );
+};
+
+/** @id MochiKit.Visual.pulsate */
+MochiKit.Visual.pulsate = function (element, /* optional */ options) {
+    /***
+
+    Pulse an element between appear/fade.
+
+    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
+    var b = MochiKit.Base;
+    var oldOpacity = MochiKit.Style.getStyle(element, 'opacity');
+    options = b.update({
+        duration: 3.0,
+        from: 0,
+        afterFinishInternal: function (effect) {
+            MochiKit.Style.setStyle(effect.element, {'opacity': oldOpacity});
+        }
+    }, options);
+    var transition = options.transition || v.Transitions.sinoidal;
+    var reverser = b.bind(function (pos) {
+        return transition(1 - v.Transitions.pulse(pos, options.pulses));
+    }, transition);
+    b.bind(reverser, transition);
+    return new v.Opacity(element, b.update({
+        transition: reverser}, options));
+};
+
+/** @id MochiKit.Visual.fold */
+MochiKit.Visual.fold = function (element, /* optional */ options) {
+    /***
+
+    Fold an element, first vertically, then horizontally.
+
+    ***/
+    var d = MochiKit.DOM;
+    var v = MochiKit.Visual;
+    var s = MochiKit.Style;
+    element = d.getElement(element);
+    var oldStyle = {
+        top: element.style.top,
+        left: element.style.left,
+        width: element.style.width,
+        height: element.style.height
+    };
+    var elemClip = d.makeClipping(element);
+    options = MochiKit.Base.update({
+        scaleContent: false,
+        scaleX: false,
+        afterFinishInternal: function (effect) {
+            new v.Scale(element, 1, {
+                scaleContent: false,
+                scaleY: false,
+                afterFinishInternal: function (effect) {
+                    s.hideElement(effect.element);
+                    d.undoClipping(effect.element, elemClip);
+                    s.setStyle(effect.element, oldStyle);
+                }
+            });
+        }
+    }, options);
+    return new v.Scale(element, 5, options);
+};
+
+
+// Compatibility with MochiKit 1.0
+MochiKit.Visual.Color = MochiKit.Color.Color;
+MochiKit.Visual.getElementsComputedStyle = MochiKit.DOM.computedStyle;
+
+/* end of Rico adaptation */
+
+MochiKit.Visual.__new__ = function () {
+    var m = MochiKit.Base;
+
+    m.nameFunctions(this);
+
+    this.EXPORT_TAGS = {
+        ":common": this.EXPORT,
+        ":all": m.concat(this.EXPORT, this.EXPORT_OK)
+    };
+
+};
+
+MochiKit.Visual.EXPORT = [
+    "roundElement",
+    "roundClass",
+    "tagifyText",
+    "multiple",
+    "toggle",
+    "Parallel",
+    "Opacity",
+    "Move",
+    "Scale",
+    "Highlight",
+    "ScrollTo",
+    "Morph",
+    "fade",
+    "appear",
+    "puff",
+    "blindUp",
+    "blindDown",
+    "switchOff",
+    "dropOut",
+    "shake",
+    "slideDown",
+    "slideUp",
+    "squish",
+    "grow",
+    "shrink",
+    "pulsate",
+    "fold"
+];
+
+MochiKit.Visual.EXPORT_OK = [
+    "Base",
+    "PAIRS"
+];
+
+MochiKit.Visual.__new__();
+
+MochiKit.Base._exportSymbols(this, MochiKit.Visual);
diff --git a/IPython/external/external/MochiKit/__init__.py b/IPython/external/external/MochiKit/__init__.py
new file mode 100644
index 0000000..f751f68
--- /dev/null
+++ b/IPython/external/external/MochiKit/__init__.py
@@ -0,0 +1,10 @@
+# encoding: utf-8
+__docformat__ = "restructuredtext en"
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
diff --git a/IPython/external/external/MochiKit/__package__.js b/IPython/external/external/MochiKit/__package__.js
new file mode 100644
index 0000000..8d644b1
--- /dev/null
+++ b/IPython/external/external/MochiKit/__package__.js
@@ -0,0 +1,18 @@
+dojo.kwCompoundRequire({
+    "common": [
+        "MochiKit.Base",
+        "MochiKit.Iter",
+        "MochiKit.Logging",
+        "MochiKit.DateTime",
+        "MochiKit.Format",
+        "MochiKit.Async",
+        "MochiKit.DOM",
+        "MochiKit.Style",
+        "MochiKit.LoggingPane",
+        "MochiKit.Color",
+        "MochiKit.Signal",
+        "MochiKit.Position",
+        "MochiKit.Visual"
+    ]
+});
+dojo.provide("MochiKit.*");
diff --git a/IPython/external/external/MochiKit/ajax_tables.js b/IPython/external/external/MochiKit/ajax_tables.js
new file mode 100644
index 0000000..05f74e4
--- /dev/null
+++ b/IPython/external/external/MochiKit/ajax_tables.js
@@ -0,0 +1,375 @@
+// This is from the MochiKit ajax_tables example
+/*
+
+On page load, the SortableManager:
+
+- Rips out all of the elements with the mochi-example class.
+- Finds the elements with the mochi-template class and saves them for
+  later parsing with "MochiTAL".
+- Finds the anchor tags with the mochi:dataformat attribute and gives them
+  onclick behvaiors to load new data, using their href as the data source.
+  This makes your XML or JSON look like a normal link to a search engine
+  (or javascript-disabled browser).
+- Clones the thead element from the table because it will be replaced on each
+  sort.
+- Sets up a default sort key of "object_name" and queues a load of the json
+  document.
+
+
+On data load, the SortableManager:
+
+- Parses the table data from the document (columns list, rows list-of-lists)
+  and turns them into a list of [{column:value, ...}] objects for easy sorting
+  and column order stability.
+- Chooses the default (or previous) sort state and triggers a sort request
+
+
+On sort request:
+
+- Replaces the cloned thead element with a copy of it that has the sort
+  indicator (&uarr; or &darr;) for the most recently sorted column (matched up
+  to the first field in the th's mochi:sortcolumn attribute), and attaches
+  onclick, onmousedown, onmouseover, onmouseout behaviors to them. The second
+  field of mochi:sortcolumn attribute is used to perform a non-string sort.
+- Performs the sort on the objects list.  If the second field of
+  mochi:sortcolumn was not "str", then a custom function is used and the
+  results are stored away in a __sort__ key, which is then used to perform the
+  sort (read: shwartzian transform).
+- Calls processMochiTAL on the page, which finds the mochi-template sections 
+  and then looks for mochi:repeat and mochi:content attributes on them, using
+  the data object.
+
+*/
+
+processMochiTAL = function (dom, data) {
+    /***
+
+        A TAL-esque template attribute language processor,
+        including content replacement and repeat
+
+    ***/
+
+    // nodeType == 1 is an element, we're leaving
+    // text nodes alone.
+    if (dom.nodeType != 1) {
+        return;
+    }
+    var attr;
+    // duplicate this element for each item in the
+    // given list, and then process the duplicated
+    // element again (sans mochi:repeat tag)
+    attr = getAttribute(dom, "mochi:repeat");
+    if (attr) {
+        dom.removeAttribute("mochi:repeat");
+        var parent = dom.parentNode;
+        attr = attr.split(" ");
+        var name = attr[0];
+        var lst = valueForKeyPath(data, attr[1]);
+        if (!lst) {
+            return;
+        }
+        for (var i = 0; i < lst.length; i++) {
+            data[name] = lst[i];
+            var newDOM = dom.cloneNode(true);
+            processMochiTAL(newDOM, data);
+            parent.insertBefore(newDOM, dom);
+        }
+        parent.removeChild(dom);
+        return;
+    }
+    // do content replacement if there's a mochi:content attribute
+    // on the element
+    attr = getAttribute(dom, "mochi:content");
+    if (attr) {
+        dom.removeAttribute("mochi:content");
+        replaceChildNodes(dom, valueForKeyPath(data, attr));
+        return;
+    }
+    // we make a shallow copy of the current list of child nodes
+    // because it *will* change if there's a mochi:repeat in there!
+    var nodes = list(dom.childNodes);
+    for (var i = 0; i < nodes.length; i++) {
+        processMochiTAL(nodes[i], data);
+    }
+};
+
+mouseOverFunc = function () {
+    addElementClass(this, "over");
+};
+
+mouseOutFunc = function () {
+    removeElementClass(this, "over");
+};
+
+ignoreEvent = function (ev) {
+    if (ev && ev.preventDefault) {
+        ev.preventDefault();
+        ev.stopPropagation();
+    } else if (typeof(event) != 'undefined') {
+        event.cancelBubble = false;
+        event.returnValue = false;
+    }
+};
+
+SortTransforms = {
+    "str": operator.identity,
+    "istr": function (s) { return s.toLowerCase(); },
+/*    "isoDate": isoDate*/
+};
+
+getAttribute = function (dom, key) {
+    try {
+        return dom.getAttribute(key);
+    } catch (e) {
+        return null;
+    }
+};
+
+loadFromDataAnchor = function (ev) {
+    ignoreEvent(ev);
+    var format = this.getAttribute("mochi:dataformat");
+    var href = this.href;
+    sortableManager.loadFromURL(format, href);
+};
+
+valueForKeyPath = function (data, keyPath) {
+    var chunks = keyPath.split(".");
+    while (chunks.length && data) {
+        data = data[chunks.shift()];
+    }
+    return data;
+};
+
+
+SortableManager = function () {
+    this.thead = null;
+    this.thead_proto = null;
+    this.tbody = null;
+    this.deferred = null;
+    this.columns = [];
+    this.rows = [];
+    this.templates = [];
+    this.sortState = {};
+    bindMethods(this);
+};
+
+SortableManager.prototype = {
+
+    "initialize": function (prefix, sortkey) {
+        // just rip all mochi-examples out of the DOM
+        var examples = getElementsByTagAndClassName(null, prefix+"-example");
+        while (examples.length) {
+            swapDOM(examples.pop(), null);
+        }
+        // make a template list
+        var templates = getElementsByTagAndClassName(null, prefix+"-template");
+        for (var i = 0; i < templates.length; i++) {
+            var template = templates[i];
+            var proto = template.cloneNode(true);
+            removeElementClass(proto, prefix+"-template");
+            this.templates.push({
+                "template": proto,
+                "node": template
+            });
+        }
+        // set up the data anchors to do loads
+        var anchors = getElementsByTagAndClassName("a", null);
+        for (var i = 0; i < anchors.length; i++) {
+            var node = anchors[i];
+            var format = getAttribute(node, "mochi:dataformat");
+            if (format) {
+                node.onclick = loadFromDataAnchor;
+            }
+        }
+
+        // to find sort columns
+        this.thead = getElementsByTagAndClassName("thead", prefix)[0];
+        this.thead_proto = this.thead.cloneNode(true);
+
+        this.sortkey = sortkey;
+/*        this.loadFromURL("json", "objects.json");*/
+    },
+
+    "loadFromURL": function (format, url) {
+        log('loadFromURL', format, url);
+        var d;
+        if (this.deferred) {
+            this.deferred.cancel();
+        }
+        if (format == "xml") {
+            var d = doXHR(url, {
+                mimeType: 'text/xml',
+                headers: {Accept: 'text/xml'}
+            });
+            d.addCallback(datatableFromXMLRequest);
+        } else if (format == "json") {
+            d = loadJSONDoc(url);
+        } else {
+            throw new TypeError("format " + repr(format) + " not supported");
+        }
+        // keep track of the current deferred, so that we can cancel it
+        this.deferred = d;
+        var self = this;
+        // on success or error, remove the current deferred because it has
+        // completed, and pass through the result or error
+        d.addBoth(function (res) {
+            self.deferred = null; 
+            log('loadFromURL success');
+            return res;
+        });
+        // on success, tag the result with the format used so we can display
+        // it
+        d.addCallback(function (res) {
+            res.format = format;
+            return res;
+        });
+        // call this.initWithData(data) once it's ready
+        d.addCallback(this.initWithData);
+        // if anything goes wrong, except for a simple cancellation,
+        // then log the error and show the logger
+        d.addErrback(function (err) {
+            if (err instanceof CancelledError) {
+                return;
+            }
+            logError(err);
+            logger.debuggingBookmarklet();
+        });
+        return d;
+    },
+
+    "initWithData": function (data) {
+        /***
+
+            Initialize the SortableManager with a table object
+        
+        ***/
+
+        // reformat to [{column:value, ...}, ...] style as the objects key
+        var objects = [];
+        var rows = data.rows;
+        var cols = data.columns;
+        for (var i = 0; i < rows.length; i++) {
+            var row = rows[i];
+            var object = {};
+            for (var j = 0; j < cols.length; j++) {
+                object[cols[j]] = row[j];
+            }
+            objects.push(object);
+        }
+        data.objects = objects;
+        this.data = data;
+        // perform a sort and display based upon the previous sort state,
+        // defaulting to an ascending sort if this is the first sort
+        var order = this.sortState[this.sortkey];
+        if (typeof(order) == 'undefined') {
+            order = true;
+        }
+        this.drawSortedRows(this.sortkey, order, false);
+
+    },
+
+    "onSortClick": function (name) {
+        /***
+
+            Return a sort function for click events
+
+        ***/
+        // save ourselves from doing a bind
+        var self = this;
+        // on click, flip the last sort order of that column and sort
+        return function () {
+            log('onSortClick', name);
+            var order = self.sortState[name];
+            if (typeof(order) == 'undefined') {
+                // if it's never been sorted by this column, sort ascending
+                order = true;
+            } else if (self.sortkey == name) {
+                // if this column was sorted most recently, flip the sort order
+                order = !((typeof(order) == 'undefined') ? false : order);
+            }
+            self.drawSortedRows(name, order, true);
+        };
+    },
+
+    "drawSortedRows": function (key, forward, clicked) {
+        /***
+
+            Draw the new sorted table body, and modify the column headers
+            if appropriate
+
+        ***/
+        log('drawSortedRows', key, forward);
+
+        // save it so we can flip next time
+        this.sortState[key] = forward;
+        this.sortkey = key;
+        var sortstyle;
+
+        // setup the sort columns   
+        var thead = this.thead_proto.cloneNode(true);
+        var cols = thead.getElementsByTagName("th");
+        for (var i = 0; i < cols.length; i++) {
+            var col = cols[i];
+            var sortinfo = getAttribute(col, "mochi:sortcolumn").split(" ");
+            var sortkey = sortinfo[0];
+            col.onclick = this.onSortClick(sortkey);
+            col.onmousedown = ignoreEvent;
+            col.onmouseover = mouseOverFunc;
+            col.onmouseout = mouseOutFunc;
+            // if this is the sorted column
+            if (sortkey == key) {
+                sortstyle = sortinfo[1];
+                // \u2193 is down arrow, \u2191 is up arrow
+                // forward sorts mean the rows get bigger going down
+                var arrow = (forward ? "\u2193" : "\u2191");
+                // add the character to the column header
+                col.appendChild(SPAN(null, arrow));
+                if (clicked) {
+                    col.onmouseover();
+                }
+            }
+        }
+        this.thead = swapDOM(this.thead, thead);
+
+        // apply a sort transform to a temporary column named __sort__,
+        // and do the sort based on that column
+        if (!sortstyle) {
+            sortstyle = "str";
+        }
+        var sortfunc = SortTransforms[sortstyle];
+        if (!sortfunc) {
+            throw new TypeError("unsupported sort style " + repr(sortstyle));
+        }
+        var objects = this.data.objects;
+        for (var i = 0; i < objects.length; i++) {
+            var object = objects[i];
+            object.__sort__ = sortfunc(object[key]);
+        }
+
+        // perform the sort based on the state given (forward or reverse)
+        var cmp = (forward ? keyComparator : reverseKeyComparator);
+        objects.sort(cmp("__sort__"));
+
+        // process every template with the given data
+        // and put the processed templates in the DOM
+        for (var i = 0; i < this.templates.length; i++) {
+            log('template', i, template);
+            var template = this.templates[i];
+            var dom = template.template.cloneNode(true);
+            processMochiTAL(dom, this.data);
+            template.node = swapDOM(template.node, dom);
+        }
+        //permission based coloring
+        
+ 
+
+    }
+
+};
+
+// create the global SortableManager and initialize it on page load
+sortableManager = new SortableManager();
+sortableManager2 = new SortableManager();
+
+addLoadEvent(function() {sortableManager.initialize("notebook", "dateModified")});
+addLoadEvent(function() {sortableManager2.initialize("user", "username")});
diff --git a/IPython/external/external/README b/IPython/external/external/README
new file mode 100644
index 0000000..085adaa
--- /dev/null
+++ b/IPython/external/external/README
@@ -0,0 +1,14 @@
+===================
+ External Packages
+===================
+
+This directory contains external packages which we ship inside IPython for ease
+of distributions for users.
+
+Currently we include:
+
+- configobj
+- Itpl
+- MochiKit
+- simplegeneric
+- validate
diff --git a/IPython/external/external/__init__.py b/IPython/external/external/__init__.py
new file mode 100644
index 0000000..74c6808
--- /dev/null
+++ b/IPython/external/external/__init__.py
@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+"""
+This package contains all third-party modules bundled with IPython.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+__all__ = ['simplegeneric','twisted','Itpl', 'MochiKit']
diff --git a/IPython/external/external/configobj.py b/IPython/external/external/configobj.py
new file mode 100644
index 0000000..9e64f18
--- /dev/null
+++ b/IPython/external/external/configobj.py
@@ -0,0 +1,2501 @@
+# configobj.py
+# A config file reader/writer that supports nested sections in config files.
+# Copyright (C) 2005-2008 Michael Foord, Nicola Larosa
+# E-mail: fuzzyman AT voidspace DOT org DOT uk
+#         nico AT tekNico DOT net
+
+# ConfigObj 4
+# http://www.voidspace.org.uk/python/configobj.html
+
+# Released subject to the BSD License
+# Please see http://www.voidspace.org.uk/python/license.shtml
+
+# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
+# For information about bugfixes, updates and support, please join the
+# ConfigObj mailing list:
+# http://lists.sourceforge.net/lists/listinfo/configobj-develop
+# Comments, suggestions and bug reports welcome.
+
+from __future__ import generators
+
+import sys
+INTP_VER = sys.version_info[:2]
+if INTP_VER < (2, 2):
+    raise RuntimeError("Python v.2.2 or later needed")
+
+import os, re
+compiler = None
+try:
+    import compiler
+except ImportError:
+    # for IronPython
+    pass
+from types import StringTypes
+from warnings import warn
+try:
+    from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
+except ImportError:
+    # Python 2.2 does not have these
+    # UTF-8
+    BOM_UTF8 = '\xef\xbb\xbf'
+    # UTF-16, little endian
+    BOM_UTF16_LE = '\xff\xfe'
+    # UTF-16, big endian
+    BOM_UTF16_BE = '\xfe\xff'
+    if sys.byteorder == 'little':
+        # UTF-16, native endianness
+        BOM_UTF16 = BOM_UTF16_LE
+    else:
+        # UTF-16, native endianness
+        BOM_UTF16 = BOM_UTF16_BE
+
+# A dictionary mapping BOM to
+# the encoding to decode with, and what to set the
+# encoding attribute to.
+BOMS = {
+    BOM_UTF8: ('utf_8', None),
+    BOM_UTF16_BE: ('utf16_be', 'utf_16'),
+    BOM_UTF16_LE: ('utf16_le', 'utf_16'),
+    BOM_UTF16: ('utf_16', 'utf_16'),
+    }
+# All legal variants of the BOM codecs.
+# TODO: the list of aliases is not meant to be exhaustive, is there a
+#   better way ?
+BOM_LIST = {
+    'utf_16': 'utf_16',
+    'u16': 'utf_16',
+    'utf16': 'utf_16',
+    'utf-16': 'utf_16',
+    'utf16_be': 'utf16_be',
+    'utf_16_be': 'utf16_be',
+    'utf-16be': 'utf16_be',
+    'utf16_le': 'utf16_le',
+    'utf_16_le': 'utf16_le',
+    'utf-16le': 'utf16_le',
+    'utf_8': 'utf_8',
+    'u8': 'utf_8',
+    'utf': 'utf_8',
+    'utf8': 'utf_8',
+    'utf-8': 'utf_8',
+    }
+
+# Map of encodings to the BOM to write.
+BOM_SET = {
+    'utf_8': BOM_UTF8,
+    'utf_16': BOM_UTF16,
+    'utf16_be': BOM_UTF16_BE,
+    'utf16_le': BOM_UTF16_LE,
+    None: BOM_UTF8
+    }
+
+
+def match_utf8(encoding):
+    return BOM_LIST.get(encoding.lower()) == 'utf_8'
+
+
+# Quote strings used for writing values
+squot = "'%s'"
+dquot = '"%s"'
+noquot = "%s"
+wspace_plus = ' \r\t\n\v\t\'"'
+tsquot = '"""%s"""'
+tdquot = "'''%s'''"
+
+try:
+    enumerate
+except NameError:
+    def enumerate(obj):
+        """enumerate for Python 2.2."""
+        i = -1
+        for item in obj:
+            i += 1
+            yield i, item
+
+try:
+    True, False
+except NameError:
+    True, False = 1, 0
+
+
+__version__ = '4.5.2'
+
+__revision__ = '$Id: configobj.py 156 2006-01-31 14:57:08Z fuzzyman $'
+
+__docformat__ = "restructuredtext en"
+
+__all__ = (
+    '__version__',
+    'DEFAULT_INDENT_TYPE',
+    'DEFAULT_INTERPOLATION',
+    'ConfigObjError',
+    'NestingError',
+    'ParseError',
+    'DuplicateError',
+    'ConfigspecError',
+    'ConfigObj',
+    'SimpleVal',
+    'InterpolationError',
+    'InterpolationLoopError',
+    'MissingInterpolationOption',
+    'RepeatSectionError',
+    'ReloadError',
+    'UnreprError',
+    'UnknownType',
+    '__docformat__',
+    'flatten_errors',
+)
+
+DEFAULT_INTERPOLATION = 'configparser'
+DEFAULT_INDENT_TYPE = '    '
+MAX_INTERPOL_DEPTH = 10
+
+OPTION_DEFAULTS = {
+    'interpolation': True,
+    'raise_errors': False,
+    'list_values': True,
+    'create_empty': False,
+    'file_error': False,
+    'configspec': None,
+    'stringify': True,
+    # option may be set to one of ('', ' ', '\t')
+    'indent_type': None,
+    'encoding': None,
+    'default_encoding': None,
+    'unrepr': False,
+    'write_empty_values': False,
+}
+
+
+
+def getObj(s):
+    s = "a=" + s
+    if compiler is None:
+        raise ImportError('compiler module not available')
+    p = compiler.parse(s)
+    return p.getChildren()[1].getChildren()[0].getChildren()[1]
+
+
+class UnknownType(Exception):
+    pass
+
+
+class Builder(object):
+    
+    def build(self, o):
+        m = getattr(self, 'build_' + o.__class__.__name__, None)
+        if m is None:
+            raise UnknownType(o.__class__.__name__)
+        return m(o)
+    
+    def build_List(self, o):
+        return map(self.build, o.getChildren())
+    
+    def build_Const(self, o):
+        return o.value
+    
+    def build_Dict(self, o):
+        d = {}
+        i = iter(map(self.build, o.getChildren()))
+        for el in i:
+            d[el] = i.next()
+        return d
+    
+    def build_Tuple(self, o):
+        return tuple(self.build_List(o))
+    
+    def build_Name(self, o):
+        if o.name == 'None':
+            return None
+        if o.name == 'True':
+            return True
+        if o.name == 'False':
+            return False
+        
+        # An undefined Name
+        raise UnknownType('Undefined Name')
+    
+    def build_Add(self, o):
+        real, imag = map(self.build_Const, o.getChildren())
+        try:
+            real = float(real)
+        except TypeError:
+            raise UnknownType('Add')
+        if not isinstance(imag, complex) or imag.real != 0.0:
+            raise UnknownType('Add')
+        return real+imag
+    
+    def build_Getattr(self, o):
+        parent = self.build(o.expr)
+        return getattr(parent, o.attrname)
+    
+    def build_UnarySub(self, o):
+        return -self.build_Const(o.getChildren()[0])
+    
+    def build_UnaryAdd(self, o):
+        return self.build_Const(o.getChildren()[0])
+
+
+_builder = Builder()
+
+
+def unrepr(s):
+    if not s:
+        return s
+    return _builder.build(getObj(s))
+
+
+
+class ConfigObjError(SyntaxError):
+    """
+    This is the base class for all errors that ConfigObj raises.
+    It is a subclass of SyntaxError.
+    """
+    def __init__(self, message='', line_number=None, line=''):
+        self.line = line
+        self.line_number = line_number
+        self.message = message
+        SyntaxError.__init__(self, message)
+
+
+class NestingError(ConfigObjError):
+    """
+    This error indicates a level of nesting that doesn't match.
+    """
+
+
+class ParseError(ConfigObjError):
+    """
+    This error indicates that a line is badly written.
+    It is neither a valid ``key = value`` line,
+    nor a valid section marker line.
+    """
+
+
+class ReloadError(IOError):
+    """
+    A 'reload' operation failed.
+    This exception is a subclass of ``IOError``.
+    """
+    def __init__(self):
+        IOError.__init__(self, 'reload failed, filename is not set.')
+
+
+class DuplicateError(ConfigObjError):
+    """
+    The keyword or section specified already exists.
+    """
+
+
+class ConfigspecError(ConfigObjError):
+    """
+    An error occured whilst parsing a configspec.
+    """
+
+
+class InterpolationError(ConfigObjError):
+    """Base class for the two interpolation errors."""
+
+
+class InterpolationLoopError(InterpolationError):
+    """Maximum interpolation depth exceeded in string interpolation."""
+
+    def __init__(self, option):
+        InterpolationError.__init__(
+            self,
+            'interpolation loop detected in value "%s".' % option)
+
+
+class RepeatSectionError(ConfigObjError):
+    """
+    This error indicates additional sections in a section with a
+    ``__many__`` (repeated) section.
+    """
+
+
+class MissingInterpolationOption(InterpolationError):
+    """A value specified for interpolation was missing."""
+
+    def __init__(self, option):
+        InterpolationError.__init__(
+            self,
+            'missing option "%s" in interpolation.' % option)
+
+
+class UnreprError(ConfigObjError):
+    """An error parsing in unrepr mode."""
+
+
+
+class InterpolationEngine(object):
+    """
+    A helper class to help perform string interpolation.
+
+    This class is an abstract base class; its descendants perform
+    the actual work.
+    """
+
+    # compiled regexp to use in self.interpolate()
+    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
+
+    def __init__(self, section):
+        # the Section instance that "owns" this engine
+        self.section = section
+
+
+    def interpolate(self, key, value):
+        def recursive_interpolate(key, value, section, backtrail):
+            """The function that does the actual work.
+
+            ``value``: the string we're trying to interpolate.
+            ``section``: the section in which that string was found
+            ``backtrail``: a dict to keep track of where we've been,
+            to detect and prevent infinite recursion loops
+
+            This is similar to a depth-first-search algorithm.
+            """
+            # Have we been here already?
+            if backtrail.has_key((key, section.name)):
+                # Yes - infinite loop detected
+                raise InterpolationLoopError(key)
+            # Place a marker on our backtrail so we won't come back here again
+            backtrail[(key, section.name)] = 1
+
+            # Now start the actual work
+            match = self._KEYCRE.search(value)
+            while match:
+                # The actual parsing of the match is implementation-dependent,
+                # so delegate to our helper function
+                k, v, s = self._parse_match(match)
+                if k is None:
+                    # That's the signal that no further interpolation is needed
+                    replacement = v
+                else:
+                    # Further interpolation may be needed to obtain final value
+                    replacement = recursive_interpolate(k, v, s, backtrail)
+                # Replace the matched string with its final value
+                start, end = match.span()
+                value = ''.join((value[:start], replacement, value[end:]))
+                new_search_start = start + len(replacement)
+                # Pick up the next interpolation key, if any, for next time
+                # through the while loop
+                match = self._KEYCRE.search(value, new_search_start)
+
+            # Now safe to come back here again; remove marker from backtrail
+            del backtrail[(key, section.name)]
+
+            return value
+
+        # Back in interpolate(), all we have to do is kick off the recursive
+        # function with appropriate starting values
+        value = recursive_interpolate(key, value, self.section, {})
+        return value
+
+
+    def _fetch(self, key):
+        """Helper function to fetch values from owning section.
+
+        Returns a 2-tuple: the value, and the section where it was found.
+        """
+        # switch off interpolation before we try and fetch anything !
+        save_interp = self.section.main.interpolation
+        self.section.main.interpolation = False
+
+        # Start at section that "owns" this InterpolationEngine
+        current_section = self.section
+        while True:
+            # try the current section first
+            val = current_section.get(key)
+            if val is not None:
+                break
+            # try "DEFAULT" next
+            val = current_section.get('DEFAULT', {}).get(key)
+            if val is not None:
+                break
+            # move up to parent and try again
+            # top-level's parent is itself
+            if current_section.parent is current_section:
+                # reached top level, time to give up
+                break
+            current_section = current_section.parent
+
+        # restore interpolation to previous value before returning
+        self.section.main.interpolation = save_interp
+        if val is None:
+            raise MissingInterpolationOption(key)
+        return val, current_section
+
+
+    def _parse_match(self, match):
+        """Implementation-dependent helper function.
+
+        Will be passed a match object corresponding to the interpolation
+        key we just found (e.g., "%(foo)s" or "$foo"). Should look up that
+        key in the appropriate config file section (using the ``_fetch()``
+        helper function) and return a 3-tuple: (key, value, section)
+
+        ``key`` is the name of the key we're looking for
+        ``value`` is the value found for that key
+        ``section`` is a reference to the section where it was found
+
+        ``key`` and ``section`` should be None if no further
+        interpolation should be performed on the resulting value
+        (e.g., if we interpolated "$$" and returned "$").
+        """
+        raise NotImplementedError()
+    
+
+
+class ConfigParserInterpolation(InterpolationEngine):
+    """Behaves like ConfigParser."""
+    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
+
+    def _parse_match(self, match):
+        key = match.group(1)
+        value, section = self._fetch(key)
+        return key, value, section
+
+
+
+class TemplateInterpolation(InterpolationEngine):
+    """Behaves like string.Template."""
+    _delimiter = '$'
+    _KEYCRE = re.compile(r"""
+        \$(?:
+          (?P<escaped>\$)              |   # Two $ signs
+          (?P<named>[_a-z][_a-z0-9]*)  |   # $name format
+          {(?P<braced>[^}]*)}              # ${name} format
+        )
+        """, re.IGNORECASE | re.VERBOSE)
+
+    def _parse_match(self, match):
+        # Valid name (in or out of braces): fetch value from section
+        key = match.group('named') or match.group('braced')
+        if key is not None:
+            value, section = self._fetch(key)
+            return key, value, section
+        # Escaped delimiter (e.g., $$): return single delimiter
+        if match.group('escaped') is not None:
+            # Return None for key and section to indicate it's time to stop
+            return None, self._delimiter, None
+        # Anything else: ignore completely, just return it unchanged
+        return None, match.group(), None
+
+
+interpolation_engines = {
+    'configparser': ConfigParserInterpolation,
+    'template': TemplateInterpolation,
+}
+
+
+
+class Section(dict):
+    """
+    A dictionary-like object that represents a section in a config file.
+    
+    It does string interpolation if the 'interpolation' attribute
+    of the 'main' object is set to True.
+    
+    Interpolation is tried first from this object, then from the 'DEFAULT'
+    section of this object, next from the parent and its 'DEFAULT' section,
+    and so on until the main object is reached.
+    
+    A Section will behave like an ordered dictionary - following the
+    order of the ``scalars`` and ``sections`` attributes.
+    You can use this to change the order of members.
+    
+    Iteration follows the order: scalars, then sections.
+    """
+
+    def __init__(self, parent, depth, main, indict=None, name=None):
+        """
+        * parent is the section above
+        * depth is the depth level of this section
+        * main is the main ConfigObj
+        * indict is a dictionary to initialise the section with
+        """
+        if indict is None:
+            indict = {}
+        dict.__init__(self)
+        # used for nesting level *and* interpolation
+        self.parent = parent
+        # used for the interpolation attribute
+        self.main = main
+        # level of nesting depth of this Section
+        self.depth = depth
+        # purely for information
+        self.name = name
+        #
+        self._initialise()
+        # we do this explicitly so that __setitem__ is used properly
+        # (rather than just passing to ``dict.__init__``)
+        for entry, value in indict.iteritems():
+            self[entry] = value
+            
+            
+    def _initialise(self):
+        # the sequence of scalar values in this Section
+        self.scalars = []
+        # the sequence of sections in this Section
+        self.sections = []
+        # for comments :-)
+        self.comments = {}
+        self.inline_comments = {}
+        # for the configspec
+        self.configspec = {}
+        self._order = []
+        self._configspec_comments = {}
+        self._configspec_inline_comments = {}
+        self._cs_section_comments = {}
+        self._cs_section_inline_comments = {}
+        # for defaults
+        self.defaults = []
+        self.default_values = {}
+
+
+    def _interpolate(self, key, value):
+        try:
+            # do we already have an interpolation engine?
+            engine = self._interpolation_engine
+        except AttributeError:
+            # not yet: first time running _interpolate(), so pick the engine
+            name = self.main.interpolation
+            if name == True:  # note that "if name:" would be incorrect here
+                # backwards-compatibility: interpolation=True means use default
+                name = DEFAULT_INTERPOLATION
+            name = name.lower()  # so that "Template", "template", etc. all work
+            class_ = interpolation_engines.get(name, None)
+            if class_ is None:
+                # invalid value for self.main.interpolation
+                self.main.interpolation = False
+                return value
+            else:
+                # save reference to engine so we don't have to do this again
+                engine = self._interpolation_engine = class_(self)
+        # let the engine do the actual work
+        return engine.interpolate(key, value)
+
+
+    def __getitem__(self, key):
+        """Fetch the item and do string interpolation."""
+        val = dict.__getitem__(self, key)
+        if self.main.interpolation and isinstance(val, StringTypes):
+            return self._interpolate(key, val)
+        return val
+
+
+    def __setitem__(self, key, value, unrepr=False):
+        """
+        Correctly set a value.
+        
+        Making dictionary values Section instances.
+        (We have to special case 'Section' instances - which are also dicts)
+        
+        Keys must be strings.
+        Values need only be strings (or lists of strings) if
+        ``main.stringify`` is set.
+        
+        `unrepr`` must be set when setting a value to a dictionary, without
+        creating a new sub-section.
+        """
+        if not isinstance(key, StringTypes):
+            raise ValueError('The key "%s" is not a string.' % key)
+        
+        # add the comment
+        if not self.comments.has_key(key):
+            self.comments[key] = []
+            self.inline_comments[key] = ''
+        # remove the entry from defaults
+        if key in self.defaults:
+            self.defaults.remove(key)
+        #
+        if isinstance(value, Section):
+            if not self.has_key(key):
+                self.sections.append(key)
+            dict.__setitem__(self, key, value)
+        elif isinstance(value, dict) and not unrepr:
+            # First create the new depth level,
+            # then create the section
+            if not self.has_key(key):
+                self.sections.append(key)
+            new_depth = self.depth + 1
+            dict.__setitem__(
+                self,
+                key,
+                Section(
+                    self,
+                    new_depth,
+                    self.main,
+                    indict=value,
+                    name=key))
+        else:
+            if not self.has_key(key):
+                self.scalars.append(key)
+            if not self.main.stringify:
+                if isinstance(value, StringTypes):
+                    pass
+                elif isinstance(value, (list, tuple)):
+                    for entry in value:
+                        if not isinstance(entry, StringTypes):
+                            raise TypeError('Value is not a string "%s".' % entry)
+                else:
+                    raise TypeError('Value is not a string "%s".' % value)
+            dict.__setitem__(self, key, value)
+
+
+    def __delitem__(self, key):
+        """Remove items from the sequence when deleting."""
+        dict. __delitem__(self, key)
+        if key in self.scalars:
+            self.scalars.remove(key)
+        else:
+            self.sections.remove(key)
+        del self.comments[key]
+        del self.inline_comments[key]
+
+
+    def get(self, key, default=None):
+        """A version of ``get`` that doesn't bypass string interpolation."""
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
+
+    def update(self, indict):
+        """
+        A version of update that uses our ``__setitem__``.
+        """
+        for entry in indict:
+            self[entry] = indict[entry]
+
+
+    def pop(self, key, *args):
+        """
+        'D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
+        If key is not found, d is returned if given, otherwise KeyError is raised'
+        """
+        val = dict.pop(self, key, *args)
+        if key in self.scalars:
+            del self.comments[key]
+            del self.inline_comments[key]
+            self.scalars.remove(key)
+        elif key in self.sections:
+            del self.comments[key]
+            del self.inline_comments[key]
+            self.sections.remove(key)
+        if self.main.interpolation and isinstance(val, StringTypes):
+            return self._interpolate(key, val)
+        return val
+
+
+    def popitem(self):
+        """Pops the first (key,val)"""
+        sequence = (self.scalars + self.sections)
+        if not sequence:
+            raise KeyError(": 'popitem(): dictionary is empty'")
+        key = sequence[0]
+        val =  self[key]
+        del self[key]
+        return key, val
+
+
+    def clear(self):
+        """
+        A version of clear that also affects scalars/sections
+        Also clears comments and configspec.
+        
+        Leaves other attributes alone :
+            depth/main/parent are not affected
+        """
+        dict.clear(self)
+        self.scalars = []
+        self.sections = []
+        self.comments = {}
+        self.inline_comments = {}
+        self.configspec = {}
+
+
+    def setdefault(self, key, default=None):
+        """A version of setdefault that sets sequence if appropriate."""
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = default
+            return self[key]
+
+
+    def items(self):
+        """D.items() -> list of D's (key, value) pairs, as 2-tuples"""
+        return zip((self.scalars + self.sections), self.values())
+
+
+    def keys(self):
+        """D.keys() -> list of D's keys"""
+        return (self.scalars + self.sections)
+
+
+    def values(self):
+        """D.values() -> list of D's values"""
+        return [self[key] for key in (self.scalars + self.sections)]
+
+
+    def iteritems(self):
+        """D.iteritems() -> an iterator over the (key, value) items of D"""
+        return iter(self.items())
+
+
+    def iterkeys(self):
+        """D.iterkeys() -> an iterator over the keys of D"""
+        return iter((self.scalars + self.sections))
+
+    __iter__ = iterkeys
+
+
+    def itervalues(self):
+        """D.itervalues() -> an iterator over the values of D"""
+        return iter(self.values())
+
+
+    def __repr__(self):
+        """x.__repr__() <==> repr(x)"""
+        return '{%s}' % ', '.join([('%s: %s' % (repr(key), repr(self[key])))
+            for key in (self.scalars + self.sections)])
+
+    __str__ = __repr__
+    __str__.__doc__ = "x.__str__() <==> str(x)"
+
+
+    # Extra methods - not in a normal dictionary
+
+    def dict(self):
+        """
+        Return a deepcopy of self as a dictionary.
+        
+        All members that are ``Section`` instances are recursively turned to
+        ordinary dictionaries - by calling their ``dict`` method.
+        
+        >>> n = a.dict()
+        >>> n == a
+        1
+        >>> n is a
+        0
+        """
+        newdict = {}
+        for entry in self:
+            this_entry = self[entry]
+            if isinstance(this_entry, Section):
+                this_entry = this_entry.dict()
+            elif isinstance(this_entry, list):
+                # create a copy rather than a reference
+                this_entry = list(this_entry)
+            elif isinstance(this_entry, tuple):
+                # create a copy rather than a reference
+                this_entry = tuple(this_entry)
+            newdict[entry] = this_entry
+        return newdict
+
+
+    def merge(self, indict):
+        """
+        A recursive update - useful for merging config files.
+        
+        >>> a = '''[section1]
+        ...     option1 = True
+        ...     [[subsection]]
+        ...     more_options = False
+        ...     # end of file'''.splitlines()
+        >>> b = '''# File is user.ini
+        ...     [section1]
+        ...     option1 = False
+        ...     # end of file'''.splitlines()
+        >>> c1 = ConfigObj(b)
+        >>> c2 = ConfigObj(a)
+        >>> c2.merge(c1)
+        >>> c2
+        {'section1': {'option1': 'False', 'subsection': {'more_options': 'False'}}}
+        """
+        for key, val in indict.items():
+            if (key in self and isinstance(self[key], dict) and
+                                isinstance(val, dict)):
+                self[key].merge(val)
+            else:   
+                self[key] = val
+
+
+    def rename(self, oldkey, newkey):
+        """
+        Change a keyname to another, without changing position in sequence.
+        
+        Implemented so that transformations can be made on keys,
+        as well as on values. (used by encode and decode)
+        
+        Also renames comments.
+        """
+        if oldkey in self.scalars:
+            the_list = self.scalars
+        elif oldkey in self.sections:
+            the_list = self.sections
+        else:
+            raise KeyError('Key "%s" not found.' % oldkey)
+        pos = the_list.index(oldkey)
+        #
+        val = self[oldkey]
+        dict.__delitem__(self, oldkey)
+        dict.__setitem__(self, newkey, val)
+        the_list.remove(oldkey)
+        the_list.insert(pos, newkey)
+        comm = self.comments[oldkey]
+        inline_comment = self.inline_comments[oldkey]
+        del self.comments[oldkey]
+        del self.inline_comments[oldkey]
+        self.comments[newkey] = comm
+        self.inline_comments[newkey] = inline_comment
+
+
+    def walk(self, function, raise_errors=True,
+            call_on_sections=False, **keywargs):
+        """
+        Walk every member and call a function on the keyword and value.
+        
+        Return a dictionary of the return values
+        
+        If the function raises an exception, raise the errror
+        unless ``raise_errors=False``, in which case set the return value to
+        ``False``.
+        
+        Any unrecognised keyword arguments you pass to walk, will be pased on
+        to the function you pass in.
+        
+        Note: if ``call_on_sections`` is ``True`` then - on encountering a
+        subsection, *first* the function is called for the *whole* subsection,
+        and then recurses into it's members. This means your function must be
+        able to handle strings, dictionaries and lists. This allows you
+        to change the key of subsections as well as for ordinary members. The
+        return value when called on the whole subsection has to be discarded.
+        
+        See  the encode and decode methods for examples, including functions.
+        
+        .. caution::
+        
+            You can use ``walk`` to transform the names of members of a section
+            but you mustn't add or delete members.
+        
+        >>> config = '''[XXXXsection]
+        ... XXXXkey = XXXXvalue'''.splitlines()
+        >>> cfg = ConfigObj(config)
+        >>> cfg
+        {'XXXXsection': {'XXXXkey': 'XXXXvalue'}}
+        >>> def transform(section, key):
+        ...     val = section[key]
+        ...     newkey = key.replace('XXXX', 'CLIENT1')
+        ...     section.rename(key, newkey)
+        ...     if isinstance(val, (tuple, list, dict)):
+        ...         pass
+        ...     else:
+        ...         val = val.replace('XXXX', 'CLIENT1')
+        ...         section[newkey] = val
+        >>> cfg.walk(transform, call_on_sections=True)
+        {'CLIENT1section': {'CLIENT1key': None}}
+        >>> cfg
+        {'CLIENT1section': {'CLIENT1key': 'CLIENT1value'}}
+        """
+        out = {}
+        # scalars first
+        for i in range(len(self.scalars)):
+            entry = self.scalars[i]
+            try:
+                val = function(self, entry, **keywargs)
+                # bound again in case name has changed
+                entry = self.scalars[i]
+                out[entry] = val
+            except Exception:
+                if raise_errors:
+                    raise
+                else:
+                    entry = self.scalars[i]
+                    out[entry] = False
+        # then sections
+        for i in range(len(self.sections)):
+            entry = self.sections[i]
+            if call_on_sections:
+                try:
+                    function(self, entry, **keywargs)
+                except Exception:
+                    if raise_errors:
+                        raise
+                    else:
+                        entry = self.sections[i]
+                        out[entry] = False
+                # bound again in case name has changed
+                entry = self.sections[i]
+            # previous result is discarded
+            out[entry] = self[entry].walk(
+                function,
+                raise_errors=raise_errors,
+                call_on_sections=call_on_sections,
+                **keywargs)
+        return out
+
+
+    def decode(self, encoding):
+        """
+        Decode all strings and values to unicode, using the specified encoding.
+        
+        Works with subsections and list values.
+        
+        Uses the ``walk`` method.
+        
+        Testing ``encode`` and ``decode``.
+        >>> m = ConfigObj(a)
+        >>> m.decode('ascii')
+        >>> def testuni(val):
+        ...     for entry in val:
+        ...         if not isinstance(entry, unicode):
+        ...             print >> sys.stderr, type(entry)
+        ...             raise AssertionError, 'decode failed.'
+        ...         if isinstance(val[entry], dict):
+        ...             testuni(val[entry])
+        ...         elif not isinstance(val[entry], unicode):
+        ...             raise AssertionError, 'decode failed.'
+        >>> testuni(m)
+        >>> m.encode('ascii')
+        >>> a == m
+        1
+        """
+        warn('use of ``decode`` is deprecated.', DeprecationWarning)
+        def decode(section, key, encoding=encoding, warn=True):
+            """ """
+            val = section[key]
+            if isinstance(val, (list, tuple)):
+                newval = []
+                for entry in val:
+                    newval.append(entry.decode(encoding))
+            elif isinstance(val, dict):
+                newval = val
+            else:
+                newval = val.decode(encoding)
+            newkey = key.decode(encoding)
+            section.rename(key, newkey)
+            section[newkey] = newval
+        # using ``call_on_sections`` allows us to modify section names
+        self.walk(decode, call_on_sections=True)
+
+
+    def encode(self, encoding):
+        """
+        Encode all strings and values from unicode,
+        using the specified encoding.
+        
+        Works with subsections and list values.
+        Uses the ``walk`` method.
+        """
+        warn('use of ``encode`` is deprecated.', DeprecationWarning)
+        def encode(section, key, encoding=encoding):
+            """ """
+            val = section[key]
+            if isinstance(val, (list, tuple)):
+                newval = []
+                for entry in val:
+                    newval.append(entry.encode(encoding))
+            elif isinstance(val, dict):
+                newval = val
+            else:
+                newval = val.encode(encoding)
+            newkey = key.encode(encoding)
+            section.rename(key, newkey)
+            section[newkey] = newval
+        self.walk(encode, call_on_sections=True)
+
+
+    def istrue(self, key):
+        """A deprecated version of ``as_bool``."""
+        warn('use of ``istrue`` is deprecated. Use ``as_bool`` method '
+                'instead.', DeprecationWarning)
+        return self.as_bool(key)
+
+
+    def as_bool(self, key):
+        """
+        Accepts a key as input. The corresponding value must be a string or
+        the objects (``True`` or 1) or (``False`` or 0). We allow 0 and 1 to
+        retain compatibility with Python 2.2.
+        
+        If the string is one of  ``True``, ``On``, ``Yes``, or ``1`` it returns 
+        ``True``.
+        
+        If the string is one of  ``False``, ``Off``, ``No``, or ``0`` it returns 
+        ``False``.
+        
+        ``as_bool`` is not case sensitive.
+        
+        Any other input will raise a ``ValueError``.
+        
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_bool('a')
+        Traceback (most recent call last):
+        ValueError: Value "fish" is neither True nor False
+        >>> a['b'] = 'True'
+        >>> a.as_bool('b')
+        1
+        >>> a['b'] = 'off'
+        >>> a.as_bool('b')
+        0
+        """
+        val = self[key]
+        if val == True:
+            return True
+        elif val == False:
+            return False
+        else:
+            try:
+                if not isinstance(val, StringTypes):
+                    # TODO: Why do we raise a KeyError here?
+                    raise KeyError()
+                else:
+                    return self.main._bools[val.lower()]
+            except KeyError:
+                raise ValueError('Value "%s" is neither True nor False' % val)
+
+
+    def as_int(self, key):
+        """
+        A convenience method which coerces the specified value to an integer.
+        
+        If the value is an invalid literal for ``int``, a ``ValueError`` will
+        be raised.
+        
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_int('a')
+        Traceback (most recent call last):
+        ValueError: invalid literal for int(): fish
+        >>> a['b'] = '1'
+        >>> a.as_int('b')
+        1
+        >>> a['b'] = '3.2'
+        >>> a.as_int('b')
+        Traceback (most recent call last):
+        ValueError: invalid literal for int(): 3.2
+        """
+        return int(self[key])
+
+
+    def as_float(self, key):
+        """
+        A convenience method which coerces the specified value to a float.
+        
+        If the value is an invalid literal for ``float``, a ``ValueError`` will
+        be raised.
+        
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_float('a')
+        Traceback (most recent call last):
+        ValueError: invalid literal for float(): fish
+        >>> a['b'] = '1'
+        >>> a.as_float('b')
+        1.0
+        >>> a['b'] = '3.2'
+        >>> a.as_float('b')
+        3.2000000000000002
+        """
+        return float(self[key])
+
+
+    def restore_default(self, key):
+        """
+        Restore (and return) default value for the specified key.
+        
+        This method will only work for a ConfigObj that was created
+        with a configspec and has been validated.
+        
+        If there is no default value for this key, ``KeyError`` is raised.
+        """
+        default = self.default_values[key]
+        dict.__setitem__(self, key, default)
+        if key not in self.defaults:
+            self.defaults.append(key)
+        return default
+
+    
+    def restore_defaults(self):
+        """
+        Recursively restore default values to all members
+        that have them.
+        
+        This method will only work for a ConfigObj that was created
+        with a configspec and has been validated.
+        
+        It doesn't delete or modify entries without default values.
+        """
+        for key in self.default_values:
+            self.restore_default(key)
+            
+        for section in self.sections:
+            self[section].restore_defaults()
+
+
+class ConfigObj(Section):
+    """An object to read, create, and write config files."""
+
+    _keyword = re.compile(r'''^ # line start
+        (\s*)                   # indentation
+        (                       # keyword
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'"=].*?)       # no quotes
+        )
+        \s*=\s*                 # divider
+        (.*)                    # value (including list values and comments)
+        $   # line end
+        ''',
+        re.VERBOSE)
+
+    _sectionmarker = re.compile(r'''^
+        (\s*)                     # 1: indentation
+        ((?:\[\s*)+)              # 2: section marker open
+        (                         # 3: section name open
+            (?:"\s*\S.*?\s*")|    # at least one non-space with double quotes
+            (?:'\s*\S.*?\s*')|    # at least one non-space with single quotes
+            (?:[^'"\s].*?)        # at least one non-space unquoted
+        )                         # section name close
+        ((?:\s*\])+)              # 4: section marker close
+        \s*(\#.*)?                # 5: optional comment
+        $''',
+        re.VERBOSE)
+
+    # this regexp pulls list values out as a single string
+    # or single values and comments
+    # FIXME: this regex adds a '' to the end of comma terminated lists
+    #   workaround in ``_handle_value``
+    _valueexp = re.compile(r'''^
+        (?:
+            (?:
+                (
+                    (?:
+                        (?:
+                            (?:".*?")|              # double quotes
+                            (?:'.*?')|              # single quotes
+                            (?:[^'",\#][^,\#]*?)    # unquoted
+                        )
+                        \s*,\s*                     # comma
+                    )*      # match all list items ending in a comma (if any)
+                )
+                (
+                    (?:".*?")|                      # double quotes
+                    (?:'.*?')|                      # single quotes
+                    (?:[^'",\#\s][^,]*?)|           # unquoted
+                    (?:(?<!,))                      # Empty value
+                )?          # last item in a list - or string value
+            )|
+            (,)             # alternatively a single comma - empty list
+        )
+        \s*(\#.*)?          # optional comment
+        $''',
+        re.VERBOSE)
+
+    # use findall to get the members of a list value
+    _listvalueexp = re.compile(r'''
+        (
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'",\#].*?)       # unquoted
+        )
+        \s*,\s*                 # comma
+        ''',
+        re.VERBOSE)
+
+    # this regexp is used for the value
+    # when lists are switched off
+    _nolistvalue = re.compile(r'''^
+        (
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'"\#].*?)|     # unquoted
+            (?:)                # Empty value
+        )
+        \s*(\#.*)?              # optional comment
+        $''',
+        re.VERBOSE)
+
+    # regexes for finding triple quoted values on one line
+    _single_line_single = re.compile(r"^'''(.*?)'''\s*(#.*)?$")
+    _single_line_double = re.compile(r'^"""(.*?)"""\s*(#.*)?$')
+    _multi_line_single = re.compile(r"^(.*?)'''\s*(#.*)?$")
+    _multi_line_double = re.compile(r'^(.*?)"""\s*(#.*)?$')
+
+    _triple_quote = {
+        "'''": (_single_line_single, _multi_line_single),
+        '"""': (_single_line_double, _multi_line_double),
+    }
+
+    # Used by the ``istrue`` Section method
+    _bools = {
+        'yes': True, 'no': False,
+        'on': True, 'off': False,
+        '1': True, '0': False,
+        'true': True, 'false': False,
+        }
+
+
+    def __init__(self, infile=None, options=None, **kwargs):
+        """
+        Parse a config file or create a config file object.
+        
+        ``ConfigObj(infile=None, options=None, **kwargs)``
+        """
+        # init the superclass
+        Section.__init__(self, self, 0, self)
+        
+        if infile is None:
+            infile = []
+        if options is None:
+            options = {}
+        else:
+            options = dict(options)
+            
+        # keyword arguments take precedence over an options dictionary
+        options.update(kwargs)
+        
+        defaults = OPTION_DEFAULTS.copy()
+        # TODO: check the values too.
+        for entry in options:
+            if entry not in defaults:
+                raise TypeError('Unrecognised option "%s".' % entry)
+        
+        # Add any explicit options to the defaults
+        defaults.update(options)
+        self._initialise(defaults)
+        configspec = defaults['configspec']
+        self._original_configspec = configspec
+        self._load(infile, configspec)
+        
+        
+    def _load(self, infile, configspec):
+        if isinstance(infile, StringTypes):
+            self.filename = infile
+            if os.path.isfile(infile):
+                h = open(infile, 'rb')
+                infile = h.read() or []
+                h.close()
+            elif self.file_error:
+                # raise an error if the file doesn't exist
+                raise IOError('Config file not found: "%s".' % self.filename)
+            else:
+                # file doesn't already exist
+                if self.create_empty:
+                    # this is a good test that the filename specified
+                    # isn't impossible - like on a non-existent device
+                    h = open(infile, 'w')
+                    h.write('')
+                    h.close()
+                infile = []
+                
+        elif isinstance(infile, (list, tuple)):
+            infile = list(infile)
+            
+        elif isinstance(infile, dict):
+            # initialise self
+            # the Section class handles creating subsections
+            if isinstance(infile, ConfigObj):
+                # get a copy of our ConfigObj
+                infile = infile.dict()
+                
+            for entry in infile:
+                self[entry] = infile[entry]
+            del self._errors
+            
+            if configspec is not None:
+                self._handle_configspec(configspec)
+            else:
+                self.configspec = None
+            return
+        
+        elif hasattr(infile, 'read'):
+            # This supports file like objects
+            infile = infile.read() or []
+            # needs splitting into lines - but needs doing *after* decoding
+            # in case it's not an 8 bit encoding
+        else:
+            raise TypeError('infile must be a filename, file like object, or list of lines.')
+        
+        if infile:
+            # don't do it for the empty ConfigObj
+            infile = self._handle_bom(infile)
+            # infile is now *always* a list
+            #
+            # Set the newlines attribute (first line ending it finds)
+            # and strip trailing '\n' or '\r' from lines
+            for line in infile:
+                if (not line) or (line[-1] not in ('\r', '\n', '\r\n')):
+                    continue
+                for end in ('\r\n', '\n', '\r'):
+                    if line.endswith(end):
+                        self.newlines = end
+                        break
+                break
+
+            infile = [line.rstrip('\r\n') for line in infile]
+            
+        self._parse(infile)
+        # if we had any errors, now is the time to raise them
+        if self._errors:
+            info = "at line %s." % self._errors[0].line_number
+            if len(self._errors) > 1:
+                msg = "Parsing failed with several errors.\nFirst error %s" % info
+                error = ConfigObjError(msg)
+            else:
+                error = self._errors[0]
+            # set the errors attribute; it's a list of tuples:
+            # (error_type, message, line_number)
+            error.errors = self._errors
+            # set the config attribute
+            error.config = self
+            raise error
+        # delete private attributes
+        del self._errors
+        
+        if configspec is None:
+            self.configspec = None
+        else:
+            self._handle_configspec(configspec)
+    
+    
+    def _initialise(self, options=None):
+        if options is None:
+            options = OPTION_DEFAULTS
+            
+        # initialise a few variables
+        self.filename = None
+        self._errors = []
+        self.raise_errors = options['raise_errors']
+        self.interpolation = options['interpolation']
+        self.list_values = options['list_values']
+        self.create_empty = options['create_empty']
+        self.file_error = options['file_error']
+        self.stringify = options['stringify']
+        self.indent_type = options['indent_type']
+        self.encoding = options['encoding']
+        self.default_encoding = options['default_encoding']
+        self.BOM = False
+        self.newlines = None
+        self.write_empty_values = options['write_empty_values']
+        self.unrepr = options['unrepr']
+        
+        self.initial_comment = []
+        self.final_comment = []
+        self.configspec = {}
+        
+        # Clear section attributes as well
+        Section._initialise(self)
+        
+        
+    def __repr__(self):
+        return ('ConfigObj({%s})' % 
+                ', '.join([('%s: %s' % (repr(key), repr(self[key]))) 
+                for key in (self.scalars + self.sections)]))
+    
+    
+    def _handle_bom(self, infile):
+        """
+        Handle any BOM, and decode if necessary.
+        
+        If an encoding is specified, that *must* be used - but the BOM should
+        still be removed (and the BOM attribute set).
+        
+        (If the encoding is wrongly specified, then a BOM for an alternative
+        encoding won't be discovered or removed.)
+        
+        If an encoding is not specified, UTF8 or UTF16 BOM will be detected and
+        removed. The BOM attribute will be set. UTF16 will be decoded to
+        unicode.
+        
+        NOTE: This method must not be called with an empty ``infile``.
+        
+        Specifying the *wrong* encoding is likely to cause a
+        ``UnicodeDecodeError``.
+        
+        ``infile`` must always be returned as a list of lines, but may be
+        passed in as a single string.
+        """
+        if ((self.encoding is not None) and
+            (self.encoding.lower() not in BOM_LIST)):
+            # No need to check for a BOM
+            # the encoding specified doesn't have one
+            # just decode
+            return self._decode(infile, self.encoding)
+        
+        if isinstance(infile, (list, tuple)):
+            line = infile[0]
+        else:
+            line = infile
+        if self.encoding is not None:
+            # encoding explicitly supplied
+            # And it could have an associated BOM
+            # TODO: if encoding is just UTF16 - we ought to check for both
+            # TODO: big endian and little endian versions.
+            enc = BOM_LIST[self.encoding.lower()]
+            if enc == 'utf_16':
+                # For UTF16 we try big endian and little endian
+                for BOM, (encoding, final_encoding) in BOMS.items():
+                    if not final_encoding:
+                        # skip UTF8
+                        continue
+                    if infile.startswith(BOM):
+                        ### BOM discovered
+                        ##self.BOM = True
+                        # Don't need to remove BOM
+                        return self._decode(infile, encoding)
+                    
+                # If we get this far, will *probably* raise a DecodeError
+                # As it doesn't appear to start with a BOM
+                return self._decode(infile, self.encoding)
+            
+            # Must be UTF8
+            BOM = BOM_SET[enc]
+            if not line.startswith(BOM):
+                return self._decode(infile, self.encoding)
+            
+            newline = line[len(BOM):]
+            
+            # BOM removed
+            if isinstance(infile, (list, tuple)):
+                infile[0] = newline
+            else:
+                infile = newline
+            self.BOM = True
+            return self._decode(infile, self.encoding)
+        
+        # No encoding specified - so we need to check for UTF8/UTF16
+        for BOM, (encoding, final_encoding) in BOMS.items():
+            if not line.startswith(BOM):
+                continue
+            else:
+                # BOM discovered
+                self.encoding = final_encoding
+                if not final_encoding:
+                    self.BOM = True
+                    # UTF8
+                    # remove BOM
+                    newline = line[len(BOM):]
+                    if isinstance(infile, (list, tuple)):
+                        infile[0] = newline
+                    else:
+                        infile = newline
+                    # UTF8 - don't decode
+                    if isinstance(infile, StringTypes):
+                        return infile.splitlines(True)
+                    else:
+                        return infile
+                # UTF16 - have to decode
+                return self._decode(infile, encoding)
+            
+        # No BOM discovered and no encoding specified, just return
+        if isinstance(infile, StringTypes):
+            # infile read from a file will be a single string
+            return infile.splitlines(True)
+        return infile
+
+
+    def _a_to_u(self, aString):
+        """Decode ASCII strings to unicode if a self.encoding is specified."""
+        if self.encoding:
+            return aString.decode('ascii')
+        else:
+            return aString
+
+
+    def _decode(self, infile, encoding):
+        """
+        Decode infile to unicode. Using the specified encoding.
+        
+        if is a string, it also needs converting to a list.
+        """
+        if isinstance(infile, StringTypes):
+            # can't be unicode
+            # NOTE: Could raise a ``UnicodeDecodeError``
+            return infile.decode(encoding).splitlines(True)
+        for i, line in enumerate(infile):
+            if not isinstance(line, unicode):
+                # NOTE: The isinstance test here handles mixed lists of unicode/string
+                # NOTE: But the decode will break on any non-string values
+                # NOTE: Or could raise a ``UnicodeDecodeError``
+                infile[i] = line.decode(encoding)
+        return infile
+
+
+    def _decode_element(self, line):
+        """Decode element to unicode if necessary."""
+        if not self.encoding:
+            return line
+        if isinstance(line, str) and self.default_encoding:
+            return line.decode(self.default_encoding)
+        return line
+
+
+    def _str(self, value):
+        """
+        Used by ``stringify`` within validate, to turn non-string values
+        into strings.
+        """
+        if not isinstance(value, StringTypes):
+            return str(value)
+        else:
+            return value
+
+
+    def _parse(self, infile):
+        """Actually parse the config file."""
+        temp_list_values = self.list_values
+        if self.unrepr:
+            self.list_values = False
+            
+        comment_list = []
+        done_start = False
+        this_section = self
+        maxline = len(infile) - 1
+        cur_index = -1
+        reset_comment = False
+        
+        while cur_index < maxline:
+            if reset_comment:
+                comment_list = []
+            cur_index += 1
+            line = infile[cur_index]
+            sline = line.strip()
+            # do we have anything on the line ?
+            if not sline or sline.startswith('#'):
+                reset_comment = False
+                comment_list.append(line)
+                continue
+            
+            if not done_start:
+                # preserve initial comment
+                self.initial_comment = comment_list
+                comment_list = []
+                done_start = True
+                
+            reset_comment = True
+            # first we check if it's a section marker
+            mat = self._sectionmarker.match(line)
+            if mat is not None:
+                # is a section line
+                (indent, sect_open, sect_name, sect_close, comment) = mat.groups()
+                if indent and (self.indent_type is None):
+                    self.indent_type = indent
+                cur_depth = sect_open.count('[')
+                if cur_depth != sect_close.count(']'):
+                    self._handle_error("Cannot compute the section depth at line %s.",
+                                       NestingError, infile, cur_index)
+                    continue
+                
+                if cur_depth < this_section.depth:
+                    # the new section is dropping back to a previous level
+                    try:
+                        parent = self._match_depth(this_section,
+                                                   cur_depth).parent
+                    except SyntaxError:
+                        self._handle_error("Cannot compute nesting level at line %s.",
+                                           NestingError, infile, cur_index)
+                        continue
+                elif cur_depth == this_section.depth:
+                    # the new section is a sibling of the current section
+                    parent = this_section.parent
+                elif cur_depth == this_section.depth + 1:
+                    # the new section is a child the current section
+                    parent = this_section
+                else:
+                    self._handle_error("Section too nested at line %s.",
+                                       NestingError, infile, cur_index)
+                    
+                sect_name = self._unquote(sect_name)
+                if parent.has_key(sect_name):
+                    self._handle_error('Duplicate section name at line %s.',
+                                       DuplicateError, infile, cur_index)
+                    continue
+                
+                # create the new section
+                this_section = Section(
+                    parent,
+                    cur_depth,
+                    self,
+                    name=sect_name)
+                parent[sect_name] = this_section
+                parent.inline_comments[sect_name] = comment
+                parent.comments[sect_name] = comment_list
+                continue
+            #
+            # it's not a section marker,
+            # so it should be a valid ``key = value`` line
+            mat = self._keyword.match(line)
+            if mat is None:
+                # it neither matched as a keyword
+                # or a section marker
+                self._handle_error(
+                    'Invalid line at line "%s".',
+                    ParseError, infile, cur_index)
+            else:
+                # is a keyword value
+                # value will include any inline comment
+                (indent, key, value) = mat.groups()
+                if indent and (self.indent_type is None):
+                    self.indent_type = indent
+                # check for a multiline value
+                if value[:3] in ['"""', "'''"]:
+                    try:
+                        (value, comment, cur_index) = self._multiline(
+                            value, infile, cur_index, maxline)
+                    except SyntaxError:
+                        self._handle_error(
+                            'Parse error in value at line %s.',
+                            ParseError, infile, cur_index)
+                        continue
+                    else:
+                        if self.unrepr:
+                            comment = ''
+                            try:
+                                value = unrepr(value)
+                            except Exception, e:
+                                if type(e) == UnknownType:
+                                    msg = 'Unknown name or type in value at line %s.'
+                                else:
+                                    msg = 'Parse error in value at line %s.'
+                                self._handle_error(msg, UnreprError, infile,
+                                    cur_index)
+                                continue
+                else:
+                    if self.unrepr:
+                        comment = ''
+                        try:
+                            value = unrepr(value)
+                        except Exception, e:
+                            if isinstance(e, UnknownType):
+                                msg = 'Unknown name or type in value at line %s.'
+                            else:
+                                msg = 'Parse error in value at line %s.'
+                            self._handle_error(msg, UnreprError, infile,
+                                cur_index)
+                            continue
+                    else:
+                        # extract comment and lists
+                        try:
+                            (value, comment) = self._handle_value(value)
+                        except SyntaxError:
+                            self._handle_error(
+                                'Parse error in value at line %s.',
+                                ParseError, infile, cur_index)
+                            continue
+                #
+                key = self._unquote(key)
+                if this_section.has_key(key):
+                    self._handle_error(
+                        'Duplicate keyword name at line %s.',
+                        DuplicateError, infile, cur_index)
+                    continue
+                # add the key.
+                # we set unrepr because if we have got this far we will never
+                # be creating a new section
+                this_section.__setitem__(key, value, unrepr=True)
+                this_section.inline_comments[key] = comment
+                this_section.comments[key] = comment_list
+                continue
+        #
+        if self.indent_type is None:
+            # no indentation used, set the type accordingly
+            self.indent_type = ''
+
+        # preserve the final comment
+        if not self and not self.initial_comment:
+            self.initial_comment = comment_list
+        elif not reset_comment:
+            self.final_comment = comment_list
+        self.list_values = temp_list_values
+
+
+    def _match_depth(self, sect, depth):
+        """
+        Given a section and a depth level, walk back through the sections
+        parents to see if the depth level matches a previous section.
+        
+        Return a reference to the right section,
+        or raise a SyntaxError.
+        """
+        while depth < sect.depth:
+            if sect is sect.parent:
+                # we've reached the top level already
+                raise SyntaxError()
+            sect = sect.parent
+        if sect.depth == depth:
+            return sect
+        # shouldn't get here
+        raise SyntaxError()
+
+
+    def _handle_error(self, text, ErrorClass, infile, cur_index):
+        """
+        Handle an error according to the error settings.
+        
+        Either raise the error or store it.
+        The error will have occured at ``cur_index``
+        """
+        line = infile[cur_index]
+        cur_index += 1
+        message = text % cur_index
+        error = ErrorClass(message, cur_index, line)
+        if self.raise_errors:
+            # raise the error - parsing stops here
+            raise error
+        # store the error
+        # reraise when parsing has finished
+        self._errors.append(error)
+
+
+    def _unquote(self, value):
+        """Return an unquoted version of a value"""
+        if (value[0] == value[-1]) and (value[0] in ('"', "'")):
+            value = value[1:-1]
+        return value
+
+
+    def _quote(self, value, multiline=True):
+        """
+        Return a safely quoted version of a value.
+        
+        Raise a ConfigObjError if the value cannot be safely quoted.
+        If multiline is ``True`` (default) then use triple quotes
+        if necessary.
+        
+        Don't quote values that don't need it.
+        Recursively quote members of a list and return a comma joined list.
+        Multiline is ``False`` for lists.
+        Obey list syntax for empty and single member lists.
+        
+        If ``list_values=False`` then the value is only quoted if it contains
+        a ``\n`` (is multiline) or '#'.
+        
+        If ``write_empty_values`` is set, and the value is an empty string, it
+        won't be quoted.
+        """
+        if multiline and self.write_empty_values and value == '':
+            # Only if multiline is set, so that it is used for values not
+            # keys, and not values that are part of a list
+            return ''
+        
+        if multiline and isinstance(value, (list, tuple)):
+            if not value:
+                return ','
+            elif len(value) == 1:
+                return self._quote(value[0], multiline=False) + ','
+            return ', '.join([self._quote(val, multiline=False)
+                for val in value])
+        if not isinstance(value, StringTypes):
+            if self.stringify:
+                value = str(value)
+            else:
+                raise TypeError('Value "%s" is not a string.' % value)
+
+        if not value:
+            return '""'
+        
+        no_lists_no_quotes = not self.list_values and '\n' not in value and '#' not in value
+        need_triple = multiline and ((("'" in value) and ('"' in value)) or ('\n' in value ))
+        hash_triple_quote = multiline and not need_triple and ("'" in value) and ('"' in value) and ('#' in value)
+        check_for_single = (no_lists_no_quotes or not need_triple) and not hash_triple_quote
+        
+        if check_for_single:
+            if not self.list_values:
+                # we don't quote if ``list_values=False``
+                quot = noquot
+            # for normal values either single or double quotes will do
+            elif '\n' in value:
+                # will only happen if multiline is off - e.g. '\n' in key
+                raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+            elif ((value[0] not in wspace_plus) and
+                    (value[-1] not in wspace_plus) and
+                    (',' not in value)):
+                quot = noquot
+            else:
+                quot = self._get_single_quote(value)
+        else:
+            # if value has '\n' or "'" *and* '"', it will need triple quotes
+            quot = self._get_triple_quote(value)
+        
+        if quot == noquot and '#' in value and self.list_values:
+            quot = self._get_single_quote(value)
+                
+        return quot % value
+    
+    
+    def _get_single_quote(self, value):
+        if ("'" in value) and ('"' in value):
+            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+        elif '"' in value:
+            quot = squot
+        else:
+            quot = dquot
+        return quot
+    
+    
+    def _get_triple_quote(self, value):
+        if (value.find('"""') != -1) and (value.find("'''") != -1):
+            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+        if value.find('"""') == -1:
+            quot = tdquot
+        else:
+            quot = tsquot 
+        return quot
+
+
+    def _handle_value(self, value):
+        """
+        Given a value string, unquote, remove comment,
+        handle lists. (including empty and single member lists)
+        """
+        # do we look for lists in values ?
+        if not self.list_values:
+            mat = self._nolistvalue.match(value)
+            if mat is None:
+                raise SyntaxError()
+            # NOTE: we don't unquote here
+            return mat.groups()
+        #
+        mat = self._valueexp.match(value)
+        if mat is None:
+            # the value is badly constructed, probably badly quoted,
+            # or an invalid list
+            raise SyntaxError()
+        (list_values, single, empty_list, comment) = mat.groups()
+        if (list_values == '') and (single is None):
+            # change this if you want to accept empty values
+            raise SyntaxError()
+        # NOTE: note there is no error handling from here if the regex
+        # is wrong: then incorrect values will slip through
+        if empty_list is not None:
+            # the single comma - meaning an empty list
+            return ([], comment)
+        if single is not None:
+            # handle empty values
+            if list_values and not single:
+                # FIXME: the '' is a workaround because our regex now matches
+                #   '' at the end of a list if it has a trailing comma
+                single = None
+            else:
+                single = single or '""'
+                single = self._unquote(single)
+        if list_values == '':
+            # not a list value
+            return (single, comment)
+        the_list = self._listvalueexp.findall(list_values)
+        the_list = [self._unquote(val) for val in the_list]
+        if single is not None:
+            the_list += [single]
+        return (the_list, comment)
+
+
+    def _multiline(self, value, infile, cur_index, maxline):
+        """Extract the value, where we are in a multiline situation."""
+        quot = value[:3]
+        newvalue = value[3:]
+        single_line = self._triple_quote[quot][0]
+        multi_line = self._triple_quote[quot][1]
+        mat = single_line.match(value)
+        if mat is not None:
+            retval = list(mat.groups())
+            retval.append(cur_index)
+            return retval
+        elif newvalue.find(quot) != -1:
+            # somehow the triple quote is missing
+            raise SyntaxError()
+        #
+        while cur_index < maxline:
+            cur_index += 1
+            newvalue += '\n'
+            line = infile[cur_index]
+            if line.find(quot) == -1:
+                newvalue += line
+            else:
+                # end of multiline, process it
+                break
+        else:
+            # we've got to the end of the config, oops...
+            raise SyntaxError()
+        mat = multi_line.match(line)
+        if mat is None:
+            # a badly formed line
+            raise SyntaxError()
+        (value, comment) = mat.groups()
+        return (newvalue + value, comment, cur_index)
+
+
+    def _handle_configspec(self, configspec):
+        """Parse the configspec."""
+        # FIXME: Should we check that the configspec was created with the 
+        #        correct settings ? (i.e. ``list_values=False``)
+        if not isinstance(configspec, ConfigObj):
+            try:
+                configspec = ConfigObj(configspec,
+                                       raise_errors=True,
+                                       file_error=True,
+                                       list_values=False)
+            except ConfigObjError, e:
+                # FIXME: Should these errors have a reference
+                #        to the already parsed ConfigObj ?
+                raise ConfigspecError('Parsing configspec failed: %s' % e)
+            except IOError, e:
+                raise IOError('Reading configspec failed: %s' % e)
+        
+        self._set_configspec_value(configspec, self)
+
+
+    def _set_configspec_value(self, configspec, section):
+        """Used to recursively set configspec values."""
+        if '__many__' in configspec.sections:
+            section.configspec['__many__'] = configspec['__many__']
+            if len(configspec.sections) > 1:
+                # FIXME: can we supply any useful information here ?
+                raise RepeatSectionError()
+            
+        if hasattr(configspec, 'initial_comment'):
+            section._configspec_initial_comment = configspec.initial_comment
+            section._configspec_final_comment = configspec.final_comment
+            section._configspec_encoding = configspec.encoding
+            section._configspec_BOM = configspec.BOM
+            section._configspec_newlines = configspec.newlines
+            section._configspec_indent_type = configspec.indent_type
+            
+        for entry in configspec.scalars:
+            section._configspec_comments[entry] = configspec.comments[entry]
+            section._configspec_inline_comments[entry] = configspec.inline_comments[entry]
+            section.configspec[entry] = configspec[entry]
+            section._order.append(entry)
+            
+        for entry in configspec.sections:
+            if entry == '__many__':
+                continue
+            
+            section._cs_section_comments[entry] = configspec.comments[entry]
+            section._cs_section_inline_comments[entry] = configspec.inline_comments[entry]
+            if not section.has_key(entry):
+                section[entry] = {}
+            self._set_configspec_value(configspec[entry], section[entry])
+
+
+    def _handle_repeat(self, section, configspec):
+        """Dynamically assign configspec for repeated section."""
+        try:
+            section_keys = configspec.sections
+            scalar_keys = configspec.scalars
+        except AttributeError:
+            section_keys = [entry for entry in configspec 
+                                if isinstance(configspec[entry], dict)]
+            scalar_keys = [entry for entry in configspec 
+                                if not isinstance(configspec[entry], dict)]
+            
+        if '__many__' in section_keys and len(section_keys) > 1:
+            # FIXME: can we supply any useful information here ?
+            raise RepeatSectionError()
+        
+        scalars = {}
+        sections = {}
+        for entry in scalar_keys:
+            val = configspec[entry]
+            scalars[entry] = val
+        for entry in section_keys:
+            val = configspec[entry]
+            if entry == '__many__':
+                scalars[entry] = val
+                continue
+            sections[entry] = val
+            
+        section.configspec = scalars
+        for entry in sections:
+            if not section.has_key(entry):
+                section[entry] = {}
+            self._handle_repeat(section[entry], sections[entry])
+
+
+    def _write_line(self, indent_string, entry, this_entry, comment):
+        """Write an individual line, for the write method"""
+        # NOTE: the calls to self._quote here handles non-StringType values.
+        if not self.unrepr:
+            val = self._decode_element(self._quote(this_entry))
+        else:
+            val = repr(this_entry)
+        return '%s%s%s%s%s' % (indent_string,
+                               self._decode_element(self._quote(entry, multiline=False)),
+                               self._a_to_u(' = '),
+                               val,
+                               self._decode_element(comment))
+
+
+    def _write_marker(self, indent_string, depth, entry, comment):
+        """Write a section marker line"""
+        return '%s%s%s%s%s' % (indent_string,
+                               self._a_to_u('[' * depth),
+                               self._quote(self._decode_element(entry), multiline=False),
+                               self._a_to_u(']' * depth),
+                               self._decode_element(comment))
+
+
+    def _handle_comment(self, comment):
+        """Deal with a comment."""
+        if not comment:
+            return ''
+        start = self.indent_type
+        if not comment.startswith('#'):
+            start += self._a_to_u(' # ')
+        return (start + comment)
+
+
+    # Public methods
+
+    def write(self, outfile=None, section=None):
+        """
+        Write the current ConfigObj as a file
+        
+        tekNico: FIXME: use StringIO instead of real files
+        
+        >>> filename = a.filename
+        >>> a.filename = 'test.ini'
+        >>> a.write()
+        >>> a.filename = filename
+        >>> a == ConfigObj('test.ini', raise_errors=True)
+        1
+        """
+        if self.indent_type is None:
+            # this can be true if initialised from a dictionary
+            self.indent_type = DEFAULT_INDENT_TYPE
+            
+        out = []
+        cs = self._a_to_u('#')
+        csp = self._a_to_u('# ')
+        if section is None:
+            int_val = self.interpolation
+            self.interpolation = False
+            section = self
+            for line in self.initial_comment:
+                line = self._decode_element(line)
+                stripped_line = line.strip()
+                if stripped_line and not stripped_line.startswith(cs):
+                    line = csp + line
+                out.append(line)
+                
+        indent_string = self.indent_type * section.depth
+        for entry in (section.scalars + section.sections):
+            if entry in section.defaults:
+                # don't write out default values
+                continue
+            for comment_line in section.comments[entry]:
+                comment_line = self._decode_element(comment_line.lstrip())
+                if comment_line and not comment_line.startswith(cs):
+                    comment_line = csp + comment_line
+                out.append(indent_string + comment_line)
+            this_entry = section[entry]
+            comment = self._handle_comment(section.inline_comments[entry])
+            
+            if isinstance(this_entry, dict):
+                # a section
+                out.append(self._write_marker(
+                    indent_string,
+                    this_entry.depth,
+                    entry,
+                    comment))
+                out.extend(self.write(section=this_entry))
+            else:
+                out.append(self._write_line(
+                    indent_string,
+                    entry,
+                    this_entry,
+                    comment))
+                
+        if section is self:
+            for line in self.final_comment:
+                line = self._decode_element(line)
+                stripped_line = line.strip()
+                if stripped_line and not stripped_line.startswith(cs):
+                    line = csp + line
+                out.append(line)
+            self.interpolation = int_val
+            
+        if section is not self:
+            return out
+        
+        if (self.filename is None) and (outfile is None):
+            # output a list of lines
+            # might need to encode
+            # NOTE: This will *screw* UTF16, each line will start with the BOM
+            if self.encoding:
+                out = [l.encode(self.encoding) for l in out]
+            if (self.BOM and ((self.encoding is None) or
+                (BOM_LIST.get(self.encoding.lower()) == 'utf_8'))):
+                # Add the UTF8 BOM
+                if not out:
+                    out.append('')
+                out[0] = BOM_UTF8 + out[0]
+            return out
+        
+        # Turn the list to a string, joined with correct newlines
+        newline = self.newlines or os.linesep
+        output = self._a_to_u(newline).join(out)
+        if self.encoding:
+            output = output.encode(self.encoding)
+        if self.BOM and ((self.encoding is None) or match_utf8(self.encoding)):
+            # Add the UTF8 BOM
+            output = BOM_UTF8 + output
+            
+        if not output.endswith(newline):
+            output += newline
+        if outfile is not None:
+            outfile.write(output)
+        else:
+            h = open(self.filename, 'wb')
+            h.write(output)
+            h.close()
+
+
+    def validate(self, validator, preserve_errors=False, copy=False,
+                 section=None):
+        """
+        Test the ConfigObj against a configspec.
+        
+        It uses the ``validator`` object from *validate.py*.
+        
+        To run ``validate`` on the current ConfigObj, call: ::
+        
+            test = config.validate(validator)
+        
+        (Normally having previously passed in the configspec when the ConfigObj
+        was created - you can dynamically assign a dictionary of checks to the
+        ``configspec`` attribute of a section though).
+        
+        It returns ``True`` if everything passes, or a dictionary of
+        pass/fails (True/False). If every member of a subsection passes, it
+        will just have the value ``True``. (It also returns ``False`` if all
+        members fail).
+        
+        In addition, it converts the values from strings to their native
+        types if their checks pass (and ``stringify`` is set).
+        
+        If ``preserve_errors`` is ``True`` (``False`` is default) then instead
+        of a marking a fail with a ``False``, it will preserve the actual
+        exception object. This can contain info about the reason for failure.
+        For example the ``VdtValueTooSmallError`` indicates that the value
+        supplied was too small. If a value (or section) is missing it will
+        still be marked as ``False``.
+        
+        You must have the validate module to use ``preserve_errors=True``.
+        
+        You can then use the ``flatten_errors`` function to turn your nested
+        results dictionary into a flattened list of failures - useful for
+        displaying meaningful error messages.
+        """
+        if section is None:
+            if self.configspec is None:
+                raise ValueError('No configspec supplied.')
+            if preserve_errors:
+                # We do this once to remove a top level dependency on the validate module
+                # Which makes importing configobj faster
+                from validate import VdtMissingValue
+                self._vdtMissingValue = VdtMissingValue
+            section = self
+        #
+        spec_section = section.configspec
+        if copy and hasattr(section, '_configspec_initial_comment'):
+            section.initial_comment = section._configspec_initial_comment
+            section.final_comment = section._configspec_final_comment
+            section.encoding = section._configspec_encoding
+            section.BOM = section._configspec_BOM
+            section.newlines = section._configspec_newlines
+            section.indent_type = section._configspec_indent_type
+            
+        if '__many__' in section.configspec:
+            many = spec_section['__many__']
+            # dynamically assign the configspecs
+            # for the sections below
+            for entry in section.sections:
+                self._handle_repeat(section[entry], many)
+        #
+        out = {}
+        ret_true = True
+        ret_false = True
+        order = [k for k in section._order if k in spec_section]
+        order += [k for k in spec_section if k not in order]
+        for entry in order:
+            if entry == '__many__':
+                continue
+            if (not entry in section.scalars) or (entry in section.defaults):
+                # missing entries
+                # or entries from defaults
+                missing = True
+                val = None
+                if copy and not entry in section.scalars:
+                    # copy comments
+                    section.comments[entry] = (
+                        section._configspec_comments.get(entry, []))
+                    section.inline_comments[entry] = (
+                        section._configspec_inline_comments.get(entry, ''))
+                #
+            else:
+                missing = False
+                val = section[entry]
+            try:
+                check = validator.check(spec_section[entry],
+                                        val,
+                                        missing=missing
+                                        )
+            except validator.baseErrorClass, e:
+                if not preserve_errors or isinstance(e, self._vdtMissingValue):
+                    out[entry] = False
+                else:
+                    # preserve the error
+                    out[entry] = e
+                    ret_false = False
+                ret_true = False
+            else:
+                try: 
+                    section.default_values.pop(entry, None)
+                except AttributeError: 
+                    # For Python 2.2 compatibility
+                    try:
+                        del section.default_values[entry]
+                    except KeyError:
+                        pass
+                    
+                if hasattr(validator, 'get_default_value'):
+                    try: 
+                        section.default_values[entry] = validator.get_default_value(spec_section[entry])
+                    except KeyError:
+                        # No default
+                        pass
+                    
+                ret_false = False
+                out[entry] = True
+                if self.stringify or missing:
+                    # if we are doing type conversion
+                    # or the value is a supplied default
+                    if not self.stringify:
+                        if isinstance(check, (list, tuple)):
+                            # preserve lists
+                            check = [self._str(item) for item in check]
+                        elif missing and check is None:
+                            # convert the None from a default to a ''
+                            check = ''
+                        else:
+                            check = self._str(check)
+                    if (check != val) or missing:
+                        section[entry] = check
+                if not copy and missing and entry not in section.defaults:
+                    section.defaults.append(entry)
+        # Missing sections will have been created as empty ones when the
+        # configspec was read.
+        for entry in section.sections:
+            # FIXME: this means DEFAULT is not copied in copy mode
+            if section is self and entry == 'DEFAULT':
+                continue
+            if copy:
+                section.comments[entry] = section._cs_section_comments[entry]
+                section.inline_comments[entry] = (
+                    section._cs_section_inline_comments[entry])
+            check = self.validate(validator, preserve_errors=preserve_errors,
+                copy=copy, section=section[entry])
+            out[entry] = check
+            if check == False:
+                ret_true = False
+            elif check == True:
+                ret_false = False
+            else:
+                ret_true = False
+                ret_false = False
+        #
+        if ret_true:
+            return True
+        elif ret_false:
+            return False
+        return out
+
+
+    def reset(self):
+        """Clear ConfigObj instance and restore to 'freshly created' state."""
+        self.clear()
+        self._initialise()
+        # FIXME: Should be done by '_initialise', but ConfigObj constructor (and reload)
+        #        requires an empty dictionary
+        self.configspec = None
+        # Just to be sure ;-)
+        self._original_configspec = None
+        
+        
+    def reload(self):
+        """
+        Reload a ConfigObj from file.
+        
+        This method raises a ``ReloadError`` if the ConfigObj doesn't have
+        a filename attribute pointing to a file.
+        """
+        if not isinstance(self.filename, StringTypes):
+            raise ReloadError()
+
+        filename = self.filename
+        current_options = {}
+        for entry in OPTION_DEFAULTS:
+            if entry == 'configspec':
+                continue
+            current_options[entry] = getattr(self, entry)
+            
+        configspec = self._original_configspec
+        current_options['configspec'] = configspec
+            
+        self.clear()
+        self._initialise(current_options)
+        self._load(filename, configspec)
+        
+
+
+class SimpleVal(object):
+    """
+    A simple validator.
+    Can be used to check that all members expected are present.
+    
+    To use it, provide a configspec with all your members in (the value given
+    will be ignored). Pass an instance of ``SimpleVal`` to the ``validate``
+    method of your ``ConfigObj``. ``validate`` will return ``True`` if all
+    members are present, or a dictionary with True/False meaning
+    present/missing. (Whole missing sections will be replaced with ``False``)
+    """
+    
+    def __init__(self):
+        self.baseErrorClass = ConfigObjError
+    
+    def check(self, check, member, missing=False):
+        """A dummy check method, always returns the value unchanged."""
+        if missing:
+            raise self.baseErrorClass()
+        return member
+
+
+# Check / processing functions for options
+def flatten_errors(cfg, res, levels=None, results=None):
+    """
+    An example function that will turn a nested dictionary of results
+    (as returned by ``ConfigObj.validate``) into a flat list.
+    
+    ``cfg`` is the ConfigObj instance being checked, ``res`` is the results
+    dictionary returned by ``validate``.
+    
+    (This is a recursive function, so you shouldn't use the ``levels`` or
+    ``results`` arguments - they are used by the function.
+    
+    Returns a list of keys that failed. Each member of the list is a tuple :
+    ::
+    
+        ([list of sections...], key, result)
+    
+    If ``validate`` was called with ``preserve_errors=False`` (the default)
+    then ``result`` will always be ``False``.
+
+    *list of sections* is a flattened list of sections that the key was found
+    in.
+    
+    If the section was missing then key will be ``None``.
+    
+    If the value (or section) was missing then ``result`` will be ``False``.
+    
+    If ``validate`` was called with ``preserve_errors=True`` and a value
+    was present, but failed the check, then ``result`` will be the exception
+    object returned. You can use this as a string that describes the failure.
+    
+    For example *The value "3" is of the wrong type*.
+    
+    >>> import validate
+    >>> vtor = validate.Validator()
+    >>> my_ini = '''
+    ...     option1 = True
+    ...     [section1]
+    ...     option1 = True
+    ...     [section2]
+    ...     another_option = Probably
+    ...     [section3]
+    ...     another_option = True
+    ...     [[section3b]]
+    ...     value = 3
+    ...     value2 = a
+    ...     value3 = 11
+    ...     '''
+    >>> my_cfg = '''
+    ...     option1 = boolean()
+    ...     option2 = boolean()
+    ...     option3 = boolean(default=Bad_value)
+    ...     [section1]
+    ...     option1 = boolean()
+    ...     option2 = boolean()
+    ...     option3 = boolean(default=Bad_value)
+    ...     [section2]
+    ...     another_option = boolean()
+    ...     [section3]
+    ...     another_option = boolean()
+    ...     [[section3b]]
+    ...     value = integer
+    ...     value2 = integer
+    ...     value3 = integer(0, 10)
+    ...         [[[section3b-sub]]]
+    ...         value = string
+    ...     [section4]
+    ...     another_option = boolean()
+    ...     '''
+    >>> cs = my_cfg.split('\\n')
+    >>> ini = my_ini.split('\\n')
+    >>> cfg = ConfigObj(ini, configspec=cs)
+    >>> res = cfg.validate(vtor, preserve_errors=True)
+    >>> errors = []
+    >>> for entry in flatten_errors(cfg, res):
+    ...     section_list, key, error = entry
+    ...     section_list.insert(0, '[root]')
+    ...     if key is not None:
+    ...        section_list.append(key)
+    ...     else:
+    ...         section_list.append('[missing]')
+    ...     section_string = ', '.join(section_list)
+    ...     errors.append((section_string, ' = ', error))
+    >>> errors.sort()
+    >>> for entry in errors:
+    ...     print entry[0], entry[1], (entry[2] or 0)
+    [root], option2  =  0
+    [root], option3  =  the value "Bad_value" is of the wrong type.
+    [root], section1, option2  =  0
+    [root], section1, option3  =  the value "Bad_value" is of the wrong type.
+    [root], section2, another_option  =  the value "Probably" is of the wrong type.
+    [root], section3, section3b, section3b-sub, [missing]  =  0
+    [root], section3, section3b, value2  =  the value "a" is of the wrong type.
+    [root], section3, section3b, value3  =  the value "11" is too big.
+    [root], section4, [missing]  =  0
+    """
+    if levels is None:
+        # first time called
+        levels = []
+        results = []
+    if res is True:
+        return results
+    if res is False:
+        results.append((levels[:], None, False))
+        if levels:
+            levels.pop()
+        return results
+    for (key, val) in res.items():
+        if val == True:
+            continue
+        if isinstance(cfg.get(key), dict):
+            # Go down one level
+            levels.append(key)
+            flatten_errors(cfg[key], val, levels, results)
+            continue
+        results.append((levels[:], key, val))
+    #
+    # Go up one level
+    if levels:
+        levels.pop()
+    #
+    return results
+
+
+"""*A programming language is a medium of expression.* - Paul Graham"""
diff --git a/IPython/external/external/simplegeneric.py b/IPython/external/external/simplegeneric.py
new file mode 100644
index 0000000..d8c6d5b
--- /dev/null
+++ b/IPython/external/external/simplegeneric.py
@@ -0,0 +1,130 @@
+__all__ = ["generic"]
+
+from types import ClassType, InstanceType
+classtypes = type, ClassType
+
+# This is version 0.6 of Philip J. Eby's simplegeneric module
+# (http://cheeseshop.python.org/pypi/simplegeneric) patched to work
+# with Python 2.3 (which doesn't support assigning to __name__)
+
+def generic(func):
+    """Create a simple generic function"""
+
+    _sentinel = object()
+
+    def _by_class(*args, **kw):
+        cls = args[0].__class__
+        for t in type(cls.__name__, (cls,object), {}).__mro__:
+            f = _gbt(t, _sentinel)
+            if f is not _sentinel:
+                return f(*args, **kw)
+        else:
+            return func(*args, **kw)
+
+    _by_type = {object: func, InstanceType: _by_class}
+    _gbt = _by_type.get
+
+    def when_type(t):
+        """Decorator to add a method that will be called for type `t`"""
+        if not isinstance(t, classtypes):
+            raise TypeError(
+                "%r is not a type or class" % (t,)
+            )
+        def decorate(f):
+            if _by_type.setdefault(t,f) is not f:
+                raise TypeError(
+                    "%r already has method for type %r" % (func, t)
+                )
+            return f
+        return decorate
+
+
+
+
+
+
+    _by_object = {}
+    _gbo = _by_object.get
+
+    def when_object(o):
+        """Decorator to add a method that will be called for object `o`"""
+        def decorate(f):
+            if _by_object.setdefault(id(o), (o,f))[1] is not f:
+                raise TypeError(
+                    "%r already has method for object %r" % (func, o)
+                )
+            return f
+        return decorate
+
+
+    def dispatch(*args, **kw):
+        f = _gbo(id(args[0]), _sentinel)
+        if f is _sentinel:
+            for t in type(args[0]).__mro__:
+                f = _gbt(t, _sentinel)
+                if f is not _sentinel:
+                    return f(*args, **kw)
+            else:
+                return func(*args, **kw)
+        else:
+            return f[1](*args, **kw)
+
+    try:
+        dispatch.__name__       = func.__name__
+    except TypeError:
+        pass
+    dispatch.__dict__       = func.__dict__.copy()
+    dispatch.__doc__        = func.__doc__
+    dispatch.__module__     = func.__module__
+
+    dispatch.when_type = when_type
+    dispatch.when_object = when_object
+    dispatch.default = func
+    dispatch.has_object = lambda o: id(o) in _by_object
+    dispatch.has_type   = lambda t: t in _by_type
+    return dispatch
+
+
+
+
+def test_suite():
+    import doctest
+    return doctest.DocFileSuite(
+        'README.txt',
+        optionflags=doctest.ELLIPSIS|doctest.REPORT_ONLY_FIRST_FAILURE,
+    )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IPython/external/external/validate.py b/IPython/external/external/validate.py
new file mode 100644
index 0000000..764b18a
--- /dev/null
+++ b/IPython/external/external/validate.py
@@ -0,0 +1,1414 @@
+# validate.py
+# A Validator object
+# Copyright (C) 2005 Michael Foord, Mark Andrews, Nicola Larosa
+# E-mail: fuzzyman AT voidspace DOT org DOT uk
+#         mark AT la-la DOT com
+#         nico AT tekNico DOT net
+
+# This software is licensed under the terms of the BSD license.
+# http://www.voidspace.org.uk/python/license.shtml
+# Basically you're free to copy, modify, distribute and relicense it,
+# So long as you keep a copy of the license with it.
+
+# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
+# For information about bugfixes, updates and support, please join the
+# ConfigObj mailing list:
+# http://lists.sourceforge.net/lists/listinfo/configobj-develop
+# Comments, suggestions and bug reports welcome.
+
+"""
+    The Validator object is used to check that supplied values 
+    conform to a specification.
+    
+    The value can be supplied as a string - e.g. from a config file.
+    In this case the check will also *convert* the value to
+    the required type. This allows you to add validation
+    as a transparent layer to access data stored as strings.
+    The validation checks that the data is correct *and*
+    converts it to the expected type.
+    
+    Some standard checks are provided for basic data types.
+    Additional checks are easy to write. They can be
+    provided when the ``Validator`` is instantiated or
+    added afterwards.
+    
+    The standard functions work with the following basic data types :
+    
+    * integers
+    * floats
+    * booleans
+    * strings
+    * ip_addr
+    
+    plus lists of these datatypes
+    
+    Adding additional checks is done through coding simple functions.
+    
+    The full set of standard checks are : 
+    
+    * 'integer': matches integer values (including negative)
+                 Takes optional 'min' and 'max' arguments : ::
+    
+                   integer()
+                   integer(3, 9)  # any value from 3 to 9
+                   integer(min=0) # any positive value
+                   integer(max=9)
+    
+    * 'float': matches float values
+               Has the same parameters as the integer check.
+    
+    * 'boolean': matches boolean values - ``True`` or ``False``
+                 Acceptable string values for True are :
+                   true, on, yes, 1
+                 Acceptable string values for False are :
+                   false, off, no, 0
+    
+                 Any other value raises an error.
+    
+    * 'ip_addr': matches an Internet Protocol address, v.4, represented
+                 by a dotted-quad string, i.e. '1.2.3.4'.
+    
+    * 'string': matches any string.
+                Takes optional keyword args 'min' and 'max'
+                to specify min and max lengths of the string.
+    
+    * 'list': matches any list.
+              Takes optional keyword args 'min', and 'max' to specify min and
+              max sizes of the list. (Always returns a list.)
+    
+    * 'tuple': matches any tuple.
+              Takes optional keyword args 'min', and 'max' to specify min and
+              max sizes of the tuple. (Always returns a tuple.)
+    
+    * 'int_list': Matches a list of integers.
+                  Takes the same arguments as list.
+    
+    * 'float_list': Matches a list of floats.
+                    Takes the same arguments as list.
+    
+    * 'bool_list': Matches a list of boolean values.
+                   Takes the same arguments as list.
+    
+    * 'ip_addr_list': Matches a list of IP addresses.
+                     Takes the same arguments as list.
+    
+    * 'string_list': Matches a list of strings.
+                     Takes the same arguments as list.
+    
+    * 'mixed_list': Matches a list with different types in 
+                    specific positions. List size must match
+                    the number of arguments.
+    
+                    Each position can be one of :
+                    'integer', 'float', 'ip_addr', 'string', 'boolean'
+    
+                    So to specify a list with two strings followed
+                    by two integers, you write the check as : ::
+    
+                      mixed_list('string', 'string', 'integer', 'integer')
+    
+    * 'pass': This check matches everything ! It never fails
+              and the value is unchanged.
+    
+              It is also the default if no check is specified.
+    
+    * 'option': This check matches any from a list of options.
+                You specify this check with : ::
+    
+                  option('option 1', 'option 2', 'option 3')
+    
+    You can supply a default value (returned if no value is supplied)
+    using the default keyword argument.
+    
+    You specify a list argument for default using a list constructor syntax in
+    the check : ::
+    
+        checkname(arg1, arg2, default=list('val 1', 'val 2', 'val 3'))
+    
+    A badly formatted set of arguments will raise a ``VdtParamError``.
+"""
+
+__docformat__ = "restructuredtext en"
+
+__version__ = '0.3.2'
+
+__revision__ = '$Id: validate.py 123 2005-09-08 08:54:28Z fuzzyman $'
+
+__all__ = (
+    '__version__',
+    'dottedQuadToNum',
+    'numToDottedQuad',
+    'ValidateError',
+    'VdtUnknownCheckError',
+    'VdtParamError',
+    'VdtTypeError',
+    'VdtValueError',
+    'VdtValueTooSmallError',
+    'VdtValueTooBigError',
+    'VdtValueTooShortError',
+    'VdtValueTooLongError',
+    'VdtMissingValue',
+    'Validator',
+    'is_integer',
+    'is_float',
+    'is_boolean',
+    'is_list',
+    'is_tuple',
+    'is_ip_addr',
+    'is_string',
+    'is_int_list',
+    'is_bool_list',
+    'is_float_list',
+    'is_string_list',
+    'is_ip_addr_list',
+    'is_mixed_list',
+    'is_option',
+    '__docformat__',
+)
+
+
+import sys
+INTP_VER = sys.version_info[:2]
+if INTP_VER < (2, 2):
+    raise RuntimeError("Python v.2.2 or later needed")
+
+import re
+StringTypes = (str, unicode)
+
+
+_list_arg = re.compile(r'''
+    (?:
+        ([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*list\(
+            (
+                (?:
+                    \s*
+                    (?:
+                        (?:".*?")|              # double quotes
+                        (?:'.*?')|              # single quotes
+                        (?:[^'",\s\)][^,\)]*?)  # unquoted
+                    )
+                    \s*,\s*
+                )*
+                (?:
+                    (?:".*?")|              # double quotes
+                    (?:'.*?')|              # single quotes
+                    (?:[^'",\s\)][^,\)]*?)  # unquoted
+                )?                          # last one
+            )
+        \)
+    )
+''', re.VERBOSE)    # two groups
+
+_list_members = re.compile(r'''
+    (
+        (?:".*?")|              # double quotes
+        (?:'.*?')|              # single quotes
+        (?:[^'",\s=][^,=]*?)       # unquoted
+    )
+    (?:
+    (?:\s*,\s*)|(?:\s*$)            # comma
+    )
+''', re.VERBOSE)    # one group
+
+_paramstring = r'''
+    (?:
+        (
+            (?:
+                [a-zA-Z_][a-zA-Z0-9_]*\s*=\s*list\(
+                    (?:
+                        \s*
+                        (?:
+                            (?:".*?")|              # double quotes
+                            (?:'.*?')|              # single quotes
+                            (?:[^'",\s\)][^,\)]*?)       # unquoted
+                        )
+                        \s*,\s*
+                    )*
+                    (?:
+                        (?:".*?")|              # double quotes
+                        (?:'.*?')|              # single quotes
+                        (?:[^'",\s\)][^,\)]*?)       # unquoted
+                    )?                              # last one
+                \)
+            )|
+            (?:
+                (?:".*?")|              # double quotes
+                (?:'.*?')|              # single quotes
+                (?:[^'",\s=][^,=]*?)|       # unquoted
+                (?:                         # keyword argument
+                    [a-zA-Z_][a-zA-Z0-9_]*\s*=\s*
+                    (?:
+                        (?:".*?")|              # double quotes
+                        (?:'.*?')|              # single quotes
+                        (?:[^'",\s=][^,=]*?)       # unquoted
+                    )
+                )
+            )
+        )
+        (?:
+            (?:\s*,\s*)|(?:\s*$)            # comma
+        )
+    )
+    '''
+
+_matchstring = '^%s*' % _paramstring
+
+# Python pre 2.2.1 doesn't have bool
+try:
+    bool
+except NameError:
+    def bool(val):
+        """Simple boolean equivalent function. """
+        if val:
+            return 1
+        else:
+            return 0
+
+
+def dottedQuadToNum(ip):
+    """
+    Convert decimal dotted quad string to long integer
+    
+    >>> dottedQuadToNum('1 ')
+    1L
+    >>> dottedQuadToNum(' 1.2')
+    16777218L
+    >>> dottedQuadToNum(' 1.2.3 ')
+    16908291L
+    >>> dottedQuadToNum('1.2.3.4')
+    16909060L
+    >>> dottedQuadToNum('1.2.3. 4')
+    Traceback (most recent call last):
+    ValueError: Not a good dotted-quad IP: 1.2.3. 4
+    >>> dottedQuadToNum('255.255.255.255')
+    4294967295L
+    >>> dottedQuadToNum('255.255.255.256')
+    Traceback (most recent call last):
+    ValueError: Not a good dotted-quad IP: 255.255.255.256
+    """
+    
+    # import here to avoid it when ip_addr values are not used
+    import socket, struct
+    
+    try:
+        return struct.unpack('!L',
+            socket.inet_aton(ip.strip()))[0]
+    except socket.error:
+        # bug in inet_aton, corrected in Python 2.3
+        if ip.strip() == '255.255.255.255':
+            return 0xFFFFFFFFL
+        else:
+            raise ValueError('Not a good dotted-quad IP: %s' % ip)
+    return
+
+
+def numToDottedQuad(num):
+    """
+    Convert long int to dotted quad string
+    
+    >>> numToDottedQuad(-1L)
+    Traceback (most recent call last):
+    ValueError: Not a good numeric IP: -1
+    >>> numToDottedQuad(1L)
+    '0.0.0.1'
+    >>> numToDottedQuad(16777218L)
+    '1.0.0.2'
+    >>> numToDottedQuad(16908291L)
+    '1.2.0.3'
+    >>> numToDottedQuad(16909060L)
+    '1.2.3.4'
+    >>> numToDottedQuad(4294967295L)
+    '255.255.255.255'
+    >>> numToDottedQuad(4294967296L)
+    Traceback (most recent call last):
+    ValueError: Not a good numeric IP: 4294967296
+    """
+    
+    # import here to avoid it when ip_addr values are not used
+    import socket, struct
+    
+    # no need to intercept here, 4294967295L is fine
+    try:
+        return socket.inet_ntoa(
+            struct.pack('!L', long(num)))
+    except (socket.error, struct.error, OverflowError):
+        raise ValueError('Not a good numeric IP: %s' % num)
+
+
+class ValidateError(Exception):
+    """
+    This error indicates that the check failed.
+    It can be the base class for more specific errors.
+    
+    Any check function that fails ought to raise this error.
+    (or a subclass)
+    
+    >>> raise ValidateError
+    Traceback (most recent call last):
+    ValidateError
+    """
+
+
+class VdtMissingValue(ValidateError):
+    """No value was supplied to a check that needed one."""
+
+
+class VdtUnknownCheckError(ValidateError):
+    """An unknown check function was requested"""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtUnknownCheckError('yoda')
+        Traceback (most recent call last):
+        VdtUnknownCheckError: the check "yoda" is unknown.
+        """
+        ValidateError.__init__(self, 'the check "%s" is unknown.' % (value,))
+
+
+class VdtParamError(SyntaxError):
+    """An incorrect parameter was passed"""
+
+    def __init__(self, name, value):
+        """
+        >>> raise VdtParamError('yoda', 'jedi')
+        Traceback (most recent call last):
+        VdtParamError: passed an incorrect value "jedi" for parameter "yoda".
+        """
+        SyntaxError.__init__(self, 'passed an incorrect value "%s" for parameter "%s".' % (value, name))
+
+
+class VdtTypeError(ValidateError):
+    """The value supplied was of the wrong type"""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtTypeError('jedi')
+        Traceback (most recent call last):
+        VdtTypeError: the value "jedi" is of the wrong type.
+        """
+        ValidateError.__init__(self, 'the value "%s" is of the wrong type.' % (value,))
+
+
+class VdtValueError(ValidateError):
+    """The value supplied was of the correct type, but was not an allowed value."""
+    
+    def __init__(self, value):
+        """
+        >>> raise VdtValueError('jedi')
+        Traceback (most recent call last):
+        VdtValueError: the value "jedi" is unacceptable.
+        """
+        ValidateError.__init__(self, 'the value "%s" is unacceptable.' % (value,))
+
+
+class VdtValueTooSmallError(VdtValueError):
+    """The value supplied was of the correct type, but was too small."""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtValueTooSmallError('0')
+        Traceback (most recent call last):
+        VdtValueTooSmallError: the value "0" is too small.
+        """
+        ValidateError.__init__(self, 'the value "%s" is too small.' % (value,))
+
+
+class VdtValueTooBigError(VdtValueError):
+    """The value supplied was of the correct type, but was too big."""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtValueTooBigError('1')
+        Traceback (most recent call last):
+        VdtValueTooBigError: the value "1" is too big.
+        """
+        ValidateError.__init__(self, 'the value "%s" is too big.' % (value,))
+
+
+class VdtValueTooShortError(VdtValueError):
+    """The value supplied was of the correct type, but was too short."""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtValueTooShortError('jed')
+        Traceback (most recent call last):
+        VdtValueTooShortError: the value "jed" is too short.
+        """
+        ValidateError.__init__(
+            self,
+            'the value "%s" is too short.' % (value,))
+
+
+class VdtValueTooLongError(VdtValueError):
+    """The value supplied was of the correct type, but was too long."""
+
+    def __init__(self, value):
+        """
+        >>> raise VdtValueTooLongError('jedie')
+        Traceback (most recent call last):
+        VdtValueTooLongError: the value "jedie" is too long.
+        """
+        ValidateError.__init__(self, 'the value "%s" is too long.' % (value,))
+
+
+class Validator(object):
+    """
+    Validator is an object that allows you to register a set of 'checks'.
+    These checks take input and test that it conforms to the check.
+    
+    This can also involve converting the value from a string into
+    the correct datatype.
+    
+    The ``check`` method takes an input string which configures which
+    check is to be used and applies that check to a supplied value.
+    
+    An example input string would be:
+    'int_range(param1, param2)'
+    
+    You would then provide something like:
+    
+    >>> def int_range_check(value, min, max):
+    ...     # turn min and max from strings to integers
+    ...     min = int(min)
+    ...     max = int(max)
+    ...     # check that value is of the correct type.
+    ...     # possible valid inputs are integers or strings
+    ...     # that represent integers
+    ...     if not isinstance(value, (int, long, StringTypes)):
+    ...         raise VdtTypeError(value)
+    ...     elif isinstance(value, StringTypes):
+    ...         # if we are given a string
+    ...         # attempt to convert to an integer
+    ...         try:
+    ...             value = int(value)
+    ...         except ValueError:
+    ...             raise VdtValueError(value)
+    ...     # check the value is between our constraints
+    ...     if not min <= value:
+    ...          raise VdtValueTooSmallError(value)
+    ...     if not value <= max:
+    ...          raise VdtValueTooBigError(value)
+    ...     return value
+    
+    >>> fdict = {'int_range': int_range_check}
+    >>> vtr1 = Validator(fdict)
+    >>> vtr1.check('int_range(20, 40)', '30')
+    30
+    >>> vtr1.check('int_range(20, 40)', '60')
+    Traceback (most recent call last):
+    VdtValueTooBigError: the value "60" is too big.
+    
+    New functions can be added with : ::
+    
+    >>> vtr2 = Validator()       
+    >>> vtr2.functions['int_range'] = int_range_check
+    
+    Or by passing in a dictionary of functions when Validator 
+    is instantiated.
+    
+    Your functions *can* use keyword arguments,
+    but the first argument should always be 'value'.
+    
+    If the function doesn't take additional arguments,
+    the parentheses are optional in the check.
+    It can be written with either of : ::
+    
+        keyword = function_name
+        keyword = function_name()
+    
+    The first program to utilise Validator() was Michael Foord's
+    ConfigObj, an alternative to ConfigParser which supports lists and
+    can validate a config file using a config schema.
+    For more details on using Validator with ConfigObj see:
+    http://www.voidspace.org.uk/python/configobj.html
+    """
+
+    # this regex does the initial parsing of the checks
+    _func_re = re.compile(r'(.+?)\((.*)\)')
+
+    # this regex takes apart keyword arguments
+    _key_arg = re.compile(r'^([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$')
+
+
+    # this regex finds keyword=list(....) type values
+    _list_arg = _list_arg
+
+    # this regex takes individual values out of lists - in one pass
+    _list_members = _list_members
+
+    # These regexes check a set of arguments for validity
+    # and then pull the members out
+    _paramfinder = re.compile(_paramstring, re.VERBOSE)
+    _matchfinder = re.compile(_matchstring, re.VERBOSE)
+
+
+    def __init__(self, functions=None):
+        """
+        >>> vtri = Validator()
+        """
+        self.functions = {
+            '': self._pass,
+            'integer': is_integer,
+            'float': is_float,
+            'boolean': is_boolean,
+            'ip_addr': is_ip_addr,
+            'string': is_string,
+            'list': is_list,
+            'tuple': is_tuple,
+            'int_list': is_int_list,
+            'float_list': is_float_list,
+            'bool_list': is_bool_list,
+            'ip_addr_list': is_ip_addr_list,
+            'string_list': is_string_list,
+            'mixed_list': is_mixed_list,
+            'pass': self._pass,
+            'option': is_option,
+        }
+        if functions is not None:
+            self.functions.update(functions)
+        # tekNico: for use by ConfigObj
+        self.baseErrorClass = ValidateError
+        self._cache = {}
+
+
+    def check(self, check, value, missing=False):
+        """
+        Usage: check(check, value)
+        
+        Arguments:
+            check: string representing check to apply (including arguments)
+            value: object to be checked
+        Returns value, converted to correct type if necessary
+        
+        If the check fails, raises a ``ValidateError`` subclass.
+        
+        >>> vtor.check('yoda', '')
+        Traceback (most recent call last):
+        VdtUnknownCheckError: the check "yoda" is unknown.
+        >>> vtor.check('yoda()', '')
+        Traceback (most recent call last):
+        VdtUnknownCheckError: the check "yoda" is unknown.
+        
+        >>> vtor.check('string(default="")', '', missing=True)
+        ''
+        """
+        fun_name, fun_args, fun_kwargs, default = self._parse_with_caching(check)
+            
+        if missing:
+            if default is None:
+                # no information needed here - to be handled by caller
+                raise VdtMissingValue()
+            value = self._handle_none(default)
+                
+        if value is None:
+            return None
+        
+        return self._check_value(value, fun_name, fun_args, fun_kwargs)
+
+
+    def _handle_none(self, value):
+        if value == 'None':
+            value = None
+        elif value in ("'None'", '"None"'):
+            # Special case a quoted None
+            value = self._unquote(value)
+        return value
+
+
+    def _parse_with_caching(self, check):
+        if check in self._cache:
+            fun_name, fun_args, fun_kwargs, default = self._cache[check]
+            # We call list and dict below to work with *copies* of the data
+            # rather than the original (which are mutable of course)
+            fun_args = list(fun_args)
+            fun_kwargs = dict(fun_kwargs)
+        else:
+            fun_name, fun_args, fun_kwargs, default = self._parse_check(check)
+            fun_kwargs = dict((str(key), value) for (key, value) in fun_kwargs.items())
+            self._cache[check] = fun_name, list(fun_args), dict(fun_kwargs), default
+        return fun_name, fun_args, fun_kwargs, default
+        
+        
+    def _check_value(self, value, fun_name, fun_args, fun_kwargs):
+        try:
+            fun = self.functions[fun_name]
+        except KeyError:
+            raise VdtUnknownCheckError(fun_name)
+        else:
+            return fun(value, *fun_args, **fun_kwargs)
+
+
+    def _parse_check(self, check):
+        fun_match = self._func_re.match(check)
+        if fun_match:
+            fun_name = fun_match.group(1)
+            arg_string = fun_match.group(2)
+            arg_match = self._matchfinder.match(arg_string)
+            if arg_match is None:
+                # Bad syntax
+                raise VdtParamError('Bad syntax in check "%s".' % check)
+            fun_args = []
+            fun_kwargs = {}
+            # pull out args of group 2
+            for arg in self._paramfinder.findall(arg_string):
+                # args may need whitespace removing (before removing quotes)
+                arg = arg.strip()
+                listmatch = self._list_arg.match(arg)
+                if listmatch:
+                    key, val = self._list_handle(listmatch)
+                    fun_kwargs[key] = val
+                    continue
+                keymatch = self._key_arg.match(arg)
+                if keymatch:
+                    val = keymatch.group(2)
+                    if not val in ("'None'", '"None"'):
+                        # Special case a quoted None
+                        val = self._unquote(val)
+                    fun_kwargs[keymatch.group(1)] = val
+                    continue
+                
+                fun_args.append(self._unquote(arg))
+        else:
+            # allows for function names without (args)
+            return check, (), {}, None
+
+        # Default must be deleted if the value is specified too,
+        # otherwise the check function will get a spurious "default" keyword arg
+        try:
+            default = fun_kwargs.pop('default', None)
+        except AttributeError:
+            # Python 2.2 compatibility
+            default = None
+            try:
+                default = fun_kwargs['default']
+                del fun_kwargs['default']
+            except KeyError:
+                pass
+            
+        return fun_name, fun_args, fun_kwargs, default
+
+
+    def _unquote(self, val):
+        """Unquote a value if necessary."""
+        if (len(val) >= 2) and (val[0] in ("'", '"')) and (val[0] == val[-1]):
+            val = val[1:-1]
+        return val
+
+
+    def _list_handle(self, listmatch):
+        """Take apart a ``keyword=list('val, 'val')`` type string."""
+        out = []
+        name = listmatch.group(1)
+        args = listmatch.group(2)
+        for arg in self._list_members.findall(args):
+            out.append(self._unquote(arg))
+        return name, out
+
+
+    def _pass(self, value):
+        """
+        Dummy check that always passes
+        
+        >>> vtor.check('', 0)
+        0
+        >>> vtor.check('', '0')
+        '0'
+        """
+        return value
+    
+    
+    def get_default_value(self, check):
+        """
+        Given a check, return the default value for the check
+        (converted to the right type).
+        
+        If the check doesn't specify a default value then a
+        ``KeyError`` will be raised.
+        """
+        fun_name, fun_args, fun_kwargs, default = self._parse_with_caching(check)
+        if default is None:
+            raise KeyError('Check "%s" has no default value.' % check)
+        value = self._handle_none(default)
+        if value is None:
+            return value
+        return self._check_value(value, fun_name, fun_args, fun_kwargs)
+
+
+def _is_num_param(names, values, to_float=False):
+    """
+    Return numbers from inputs or raise VdtParamError.
+    
+    Lets ``None`` pass through.
+    Pass in keyword argument ``to_float=True`` to
+    use float for the conversion rather than int.
+    
+    >>> _is_num_param(('', ''), (0, 1.0))
+    [0, 1]
+    >>> _is_num_param(('', ''), (0, 1.0), to_float=True)
+    [0.0, 1.0]
+    >>> _is_num_param(('a'), ('a'))
+    Traceback (most recent call last):
+    VdtParamError: passed an incorrect value "a" for parameter "a".
+    """
+    fun = to_float and float or int
+    out_params = []
+    for (name, val) in zip(names, values):
+        if val is None:
+            out_params.append(val)
+        elif isinstance(val, (int, long, float, StringTypes)):
+            try:
+                out_params.append(fun(val))
+            except ValueError, e:
+                raise VdtParamError(name, val)
+        else:
+            raise VdtParamError(name, val)
+    return out_params
+
+
+# built in checks
+# you can override these by setting the appropriate name
+# in Validator.functions
+# note: if the params are specified wrongly in your input string,
+#       you will also raise errors.
+
+def is_integer(value, min=None, max=None):
+    """
+    A check that tests that a given value is an integer (int, or long)
+    and optionally, between bounds. A negative value is accepted, while
+    a float will fail.
+    
+    If the value is a string, then the conversion is done - if possible.
+    Otherwise a VdtError is raised.
+    
+    >>> vtor.check('integer', '-1')
+    -1
+    >>> vtor.check('integer', '0')
+    0
+    >>> vtor.check('integer', 9)
+    9
+    >>> vtor.check('integer', 'a')
+    Traceback (most recent call last):
+    VdtTypeError: the value "a" is of the wrong type.
+    >>> vtor.check('integer', '2.2')
+    Traceback (most recent call last):
+    VdtTypeError: the value "2.2" is of the wrong type.
+    >>> vtor.check('integer(10)', '20')
+    20
+    >>> vtor.check('integer(max=20)', '15')
+    15
+    >>> vtor.check('integer(10)', '9')
+    Traceback (most recent call last):
+    VdtValueTooSmallError: the value "9" is too small.
+    >>> vtor.check('integer(10)', 9)
+    Traceback (most recent call last):
+    VdtValueTooSmallError: the value "9" is too small.
+    >>> vtor.check('integer(max=20)', '35')
+    Traceback (most recent call last):
+    VdtValueTooBigError: the value "35" is too big.
+    >>> vtor.check('integer(max=20)', 35)
+    Traceback (most recent call last):
+    VdtValueTooBigError: the value "35" is too big.
+    >>> vtor.check('integer(0, 9)', False)
+    0
+    """
+    (min_val, max_val) = _is_num_param(('min', 'max'), (min, max))
+    if not isinstance(value, (int, long, StringTypes)):
+        raise VdtTypeError(value)
+    if isinstance(value, StringTypes):
+        # if it's a string - does it represent an integer ?
+        try:
+            value = int(value)
+        except ValueError:
+            raise VdtTypeError(value)
+    if (min_val is not None) and (value < min_val):
+        raise VdtValueTooSmallError(value)
+    if (max_val is not None) and (value > max_val):
+        raise VdtValueTooBigError(value)
+    return value
+
+
+def is_float(value, min=None, max=None):
+    """
+    A check that tests that a given value is a float
+    (an integer will be accepted), and optionally - that it is between bounds.
+    
+    If the value is a string, then the conversion is done - if possible.
+    Otherwise a VdtError is raised.
+    
+    This can accept negative values.
+    
+    >>> vtor.check('float', '2')
+    2.0
+    
+    From now on we multiply the value to avoid comparing decimals
+    
+    >>> vtor.check('float', '-6.8') * 10
+    -68.0
+    >>> vtor.check('float', '12.2') * 10
+    122.0
+    >>> vtor.check('float', 8.4) * 10
+    84.0
+    >>> vtor.check('float', 'a')
+    Traceback (most recent call last):
+    VdtTypeError: the value "a" is of the wrong type.
+    >>> vtor.check('float(10.1)', '10.2') * 10
+    102.0
+    >>> vtor.check('float(max=20.2)', '15.1') * 10
+    151.0
+    >>> vtor.check('float(10.0)', '9.0')
+    Traceback (most recent call last):
+    VdtValueTooSmallError: the value "9.0" is too small.
+    >>> vtor.check('float(max=20.0)', '35.0')
+    Traceback (most recent call last):
+    VdtValueTooBigError: the value "35.0" is too big.
+    """
+    (min_val, max_val) = _is_num_param(
+        ('min', 'max'), (min, max), to_float=True)
+    if not isinstance(value, (int, long, float, StringTypes)):
+        raise VdtTypeError(value)
+    if not isinstance(value, float):
+        # if it's a string - does it represent a float ?
+        try:
+            value = float(value)
+        except ValueError:
+            raise VdtTypeError(value)
+    if (min_val is not None) and (value < min_val):
+        raise VdtValueTooSmallError(value)
+    if (max_val is not None) and (value > max_val):
+        raise VdtValueTooBigError(value)
+    return value
+
+
+bool_dict = {
+    True: True, 'on': True, '1': True, 'true': True, 'yes': True, 
+    False: False, 'off': False, '0': False, 'false': False, 'no': False,
+}
+
+
+def is_boolean(value):
+    """
+    Check if the value represents a boolean.
+    
+    >>> vtor.check('boolean', 0)
+    0
+    >>> vtor.check('boolean', False)
+    0
+    >>> vtor.check('boolean', '0')
+    0
+    >>> vtor.check('boolean', 'off')
+    0
+    >>> vtor.check('boolean', 'false')
+    0
+    >>> vtor.check('boolean', 'no')
+    0
+    >>> vtor.check('boolean', 'nO')
+    0
+    >>> vtor.check('boolean', 'NO')
+    0
+    >>> vtor.check('boolean', 1)
+    1
+    >>> vtor.check('boolean', True)
+    1
+    >>> vtor.check('boolean', '1')
+    1
+    >>> vtor.check('boolean', 'on')
+    1
+    >>> vtor.check('boolean', 'true')
+    1
+    >>> vtor.check('boolean', 'yes')
+    1
+    >>> vtor.check('boolean', 'Yes')
+    1
+    >>> vtor.check('boolean', 'YES')
+    1
+    >>> vtor.check('boolean', '')
+    Traceback (most recent call last):
+    VdtTypeError: the value "" is of the wrong type.
+    >>> vtor.check('boolean', 'up')
+    Traceback (most recent call last):
+    VdtTypeError: the value "up" is of the wrong type.
+    
+    """
+    if isinstance(value, StringTypes):
+        try:
+            return bool_dict[value.lower()]
+        except KeyError:
+            raise VdtTypeError(value)
+    # we do an equality test rather than an identity test
+    # this ensures Python 2.2 compatibilty
+    # and allows 0 and 1 to represent True and False
+    if value == False:
+        return False
+    elif value == True:
+        return True
+    else:
+        raise VdtTypeError(value)
+
+
+def is_ip_addr(value):
+    """
+    Check that the supplied value is an Internet Protocol address, v.4,
+    represented by a dotted-quad string, i.e. '1.2.3.4'.
+    
+    >>> vtor.check('ip_addr', '1 ')
+    '1'
+    >>> vtor.check('ip_addr', ' 1.2')
+    '1.2'
+    >>> vtor.check('ip_addr', ' 1.2.3 ')
+    '1.2.3'
+    >>> vtor.check('ip_addr', '1.2.3.4')
+    '1.2.3.4'
+    >>> vtor.check('ip_addr', '0.0.0.0')
+    '0.0.0.0'
+    >>> vtor.check('ip_addr', '255.255.255.255')
+    '255.255.255.255'
+    >>> vtor.check('ip_addr', '255.255.255.256')
+    Traceback (most recent call last):
+    VdtValueError: the value "255.255.255.256" is unacceptable.
+    >>> vtor.check('ip_addr', '1.2.3.4.5')
+    Traceback (most recent call last):
+    VdtValueError: the value "1.2.3.4.5" is unacceptable.
+    >>> vtor.check('ip_addr', '1.2.3. 4')
+    Traceback (most recent call last):
+    VdtValueError: the value "1.2.3. 4" is unacceptable.
+    >>> vtor.check('ip_addr', 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    """
+    if not isinstance(value, StringTypes):
+        raise VdtTypeError(value)
+    value = value.strip()
+    try:
+        dottedQuadToNum(value)
+    except ValueError:
+        raise VdtValueError(value)
+    return value
+
+
+def is_list(value, min=None, max=None):
+    """
+    Check that the value is a list of values.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    It does no check on list members.
+    
+    >>> vtor.check('list', ())
+    []
+    >>> vtor.check('list', [])
+    []
+    >>> vtor.check('list', (1, 2))
+    [1, 2]
+    >>> vtor.check('list', [1, 2])
+    [1, 2]
+    >>> vtor.check('list(3)', (1, 2))
+    Traceback (most recent call last):
+    VdtValueTooShortError: the value "(1, 2)" is too short.
+    >>> vtor.check('list(max=5)', (1, 2, 3, 4, 5, 6))
+    Traceback (most recent call last):
+    VdtValueTooLongError: the value "(1, 2, 3, 4, 5, 6)" is too long.
+    >>> vtor.check('list(min=3, max=5)', (1, 2, 3, 4))
+    [1, 2, 3, 4]
+    >>> vtor.check('list', 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    >>> vtor.check('list', '12')
+    Traceback (most recent call last):
+    VdtTypeError: the value "12" is of the wrong type.
+    """
+    (min_len, max_len) = _is_num_param(('min', 'max'), (min, max))
+    if isinstance(value, StringTypes):
+        raise VdtTypeError(value)
+    try:
+        num_members = len(value)
+    except TypeError:
+        raise VdtTypeError(value)
+    if min_len is not None and num_members < min_len:
+        raise VdtValueTooShortError(value)
+    if max_len is not None and num_members > max_len:
+        raise VdtValueTooLongError(value)
+    return list(value)
+
+
+def is_tuple(value, min=None, max=None):
+    """
+    Check that the value is a tuple of values.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    It does no check on members.
+    
+    >>> vtor.check('tuple', ())
+    ()
+    >>> vtor.check('tuple', [])
+    ()
+    >>> vtor.check('tuple', (1, 2))
+    (1, 2)
+    >>> vtor.check('tuple', [1, 2])
+    (1, 2)
+    >>> vtor.check('tuple(3)', (1, 2))
+    Traceback (most recent call last):
+    VdtValueTooShortError: the value "(1, 2)" is too short.
+    >>> vtor.check('tuple(max=5)', (1, 2, 3, 4, 5, 6))
+    Traceback (most recent call last):
+    VdtValueTooLongError: the value "(1, 2, 3, 4, 5, 6)" is too long.
+    >>> vtor.check('tuple(min=3, max=5)', (1, 2, 3, 4))
+    (1, 2, 3, 4)
+    >>> vtor.check('tuple', 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    >>> vtor.check('tuple', '12')
+    Traceback (most recent call last):
+    VdtTypeError: the value "12" is of the wrong type.
+    """
+    return tuple(is_list(value, min, max))
+
+
+def is_string(value, min=None, max=None):
+    """
+    Check that the supplied value is a string.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    >>> vtor.check('string', '0')
+    '0'
+    >>> vtor.check('string', 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    >>> vtor.check('string(2)', '12')
+    '12'
+    >>> vtor.check('string(2)', '1')
+    Traceback (most recent call last):
+    VdtValueTooShortError: the value "1" is too short.
+    >>> vtor.check('string(min=2, max=3)', '123')
+    '123'
+    >>> vtor.check('string(min=2, max=3)', '1234')
+    Traceback (most recent call last):
+    VdtValueTooLongError: the value "1234" is too long.
+    """
+    if not isinstance(value, StringTypes):
+        raise VdtTypeError(value)
+    (min_len, max_len) = _is_num_param(('min', 'max'), (min, max))
+    try:
+        num_members = len(value)
+    except TypeError:
+        raise VdtTypeError(value)
+    if min_len is not None and num_members < min_len:
+        raise VdtValueTooShortError(value)
+    if max_len is not None and num_members > max_len:
+        raise VdtValueTooLongError(value)
+    return value
+
+
+def is_int_list(value, min=None, max=None):
+    """
+    Check that the value is a list of integers.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    Each list member is checked that it is an integer.
+    
+    >>> vtor.check('int_list', ())
+    []
+    >>> vtor.check('int_list', [])
+    []
+    >>> vtor.check('int_list', (1, 2))
+    [1, 2]
+    >>> vtor.check('int_list', [1, 2])
+    [1, 2]
+    >>> vtor.check('int_list', [1, 'a'])
+    Traceback (most recent call last):
+    VdtTypeError: the value "a" is of the wrong type.
+    """
+    return [is_integer(mem) for mem in is_list(value, min, max)]
+
+
+def is_bool_list(value, min=None, max=None):
+    """
+    Check that the value is a list of booleans.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    Each list member is checked that it is a boolean.
+    
+    >>> vtor.check('bool_list', ())
+    []
+    >>> vtor.check('bool_list', [])
+    []
+    >>> check_res = vtor.check('bool_list', (True, False))
+    >>> check_res == [True, False]
+    1
+    >>> check_res = vtor.check('bool_list', [True, False])
+    >>> check_res == [True, False]
+    1
+    >>> vtor.check('bool_list', [True, 'a'])
+    Traceback (most recent call last):
+    VdtTypeError: the value "a" is of the wrong type.
+    """
+    return [is_boolean(mem) for mem in is_list(value, min, max)]
+
+
+def is_float_list(value, min=None, max=None):
+    """
+    Check that the value is a list of floats.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    Each list member is checked that it is a float.
+    
+    >>> vtor.check('float_list', ())
+    []
+    >>> vtor.check('float_list', [])
+    []
+    >>> vtor.check('float_list', (1, 2.0))
+    [1.0, 2.0]
+    >>> vtor.check('float_list', [1, 2.0])
+    [1.0, 2.0]
+    >>> vtor.check('float_list', [1, 'a'])
+    Traceback (most recent call last):
+    VdtTypeError: the value "a" is of the wrong type.
+    """
+    return [is_float(mem) for mem in is_list(value, min, max)]
+
+
+def is_string_list(value, min=None, max=None):
+    """
+    Check that the value is a list of strings.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    Each list member is checked that it is a string.
+    
+    >>> vtor.check('string_list', ())
+    []
+    >>> vtor.check('string_list', [])
+    []
+    >>> vtor.check('string_list', ('a', 'b'))
+    ['a', 'b']
+    >>> vtor.check('string_list', ['a', 1])
+    Traceback (most recent call last):
+    VdtTypeError: the value "1" is of the wrong type.
+    >>> vtor.check('string_list', 'hello')
+    Traceback (most recent call last):
+    VdtTypeError: the value "hello" is of the wrong type.
+    """
+    if isinstance(value, StringTypes):
+        raise VdtTypeError(value)
+    return [is_string(mem) for mem in is_list(value, min, max)]
+
+
+def is_ip_addr_list(value, min=None, max=None):
+    """
+    Check that the value is a list of IP addresses.
+    
+    You can optionally specify the minimum and maximum number of members.
+    
+    Each list member is checked that it is an IP address.
+    
+    >>> vtor.check('ip_addr_list', ())
+    []
+    >>> vtor.check('ip_addr_list', [])
+    []
+    >>> vtor.check('ip_addr_list', ('1.2.3.4', '5.6.7.8'))
+    ['1.2.3.4', '5.6.7.8']
+    >>> vtor.check('ip_addr_list', ['a'])
+    Traceback (most recent call last):
+    VdtValueError: the value "a" is unacceptable.
+    """
+    return [is_ip_addr(mem) for mem in is_list(value, min, max)]
+
+
+fun_dict = {
+    'integer': is_integer,
+    'float': is_float,
+    'ip_addr': is_ip_addr,
+    'string': is_string,
+    'boolean': is_boolean,
+}
+
+
+def is_mixed_list(value, *args):
+    """
+    Check that the value is a list.
+    Allow specifying the type of each member.
+    Work on lists of specific lengths.
+    
+    You specify each member as a positional argument specifying type
+    
+    Each type should be one of the following strings :
+      'integer', 'float', 'ip_addr', 'string', 'boolean'
+    
+    So you can specify a list of two strings, followed by
+    two integers as :
+    
+      mixed_list('string', 'string', 'integer', 'integer')
+    
+    The length of the list must match the number of positional
+    arguments you supply.
+    
+    >>> mix_str = "mixed_list('integer', 'float', 'ip_addr', 'string', 'boolean')"
+    >>> check_res = vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a', True))
+    >>> check_res == [1, 2.0, '1.2.3.4', 'a', True]
+    1
+    >>> check_res = vtor.check(mix_str, ('1', '2.0', '1.2.3.4', 'a', 'True'))
+    >>> check_res == [1, 2.0, '1.2.3.4', 'a', True]
+    1
+    >>> vtor.check(mix_str, ('b', 2.0, '1.2.3.4', 'a', True))
+    Traceback (most recent call last):
+    VdtTypeError: the value "b" is of the wrong type.
+    >>> vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a'))
+    Traceback (most recent call last):
+    VdtValueTooShortError: the value "(1, 2.0, '1.2.3.4', 'a')" is too short.
+    >>> vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a', 1, 'b'))
+    Traceback (most recent call last):
+    VdtValueTooLongError: the value "(1, 2.0, '1.2.3.4', 'a', 1, 'b')" is too long.
+    >>> vtor.check(mix_str, 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    
+    This test requires an elaborate setup, because of a change in error string
+    output from the interpreter between Python 2.2 and 2.3 .
+    
+    >>> res_seq = (
+    ...     'passed an incorrect value "',
+    ...     'yoda',
+    ...     '" for parameter "mixed_list".',
+    ... )
+    >>> if INTP_VER == (2, 2):
+    ...     res_str = "".join(res_seq)
+    ... else:
+    ...     res_str = "'".join(res_seq)
+    >>> try:
+    ...     vtor.check('mixed_list("yoda")', ('a'))
+    ... except VdtParamError, err:
+    ...     str(err) == res_str
+    1
+    """
+    try:
+        length = len(value)
+    except TypeError:
+        raise VdtTypeError(value)
+    if length < len(args):
+        raise VdtValueTooShortError(value)
+    elif length > len(args):
+        raise VdtValueTooLongError(value)
+    try:
+        return [fun_dict[arg](val) for arg, val in zip(args, value)]
+    except KeyError, e:
+        raise VdtParamError('mixed_list', e)
+
+
+def is_option(value, *options):
+    """
+    This check matches the value to any of a set of options.
+    
+    >>> vtor.check('option("yoda", "jedi")', 'yoda')
+    'yoda'
+    >>> vtor.check('option("yoda", "jedi")', 'jed')
+    Traceback (most recent call last):
+    VdtValueError: the value "jed" is unacceptable.
+    >>> vtor.check('option("yoda", "jedi")', 0)
+    Traceback (most recent call last):
+    VdtTypeError: the value "0" is of the wrong type.
+    """
+    if not isinstance(value, StringTypes):
+        raise VdtTypeError(value)
+    if not value in options:
+        raise VdtValueError(value)
+    return value
+
+
+def _test(value, *args, **keywargs):
+    """
+    A function that exists for test purposes.
+    
+    >>> checks = [
+    ...     '3, 6, min=1, max=3, test=list(a, b, c)',
+    ...     '3',
+    ...     '3, 6',
+    ...     '3,',
+    ...     'min=1, test="a b c"',
+    ...     'min=5, test="a, b, c"',
+    ...     'min=1, max=3, test="a, b, c"',
+    ...     'min=-100, test=-99',
+    ...     'min=1, max=3',
+    ...     '3, 6, test="36"',
+    ...     '3, 6, test="a, b, c"',
+    ...     '3, max=3, test=list("a", "b", "c")',
+    ...     '''3, max=3, test=list("'a'", 'b', "x=(c)")''',
+    ...     "test='x=fish(3)'",
+    ...    ]
+    >>> v = Validator({'test': _test})
+    >>> for entry in checks:
+    ...     print v.check(('test(%s)' % entry), 3)
+    (3, ('3', '6'), {'test': ['a', 'b', 'c'], 'max': '3', 'min': '1'})
+    (3, ('3',), {})
+    (3, ('3', '6'), {})
+    (3, ('3',), {})
+    (3, (), {'test': 'a b c', 'min': '1'})
+    (3, (), {'test': 'a, b, c', 'min': '5'})
+    (3, (), {'test': 'a, b, c', 'max': '3', 'min': '1'})
+    (3, (), {'test': '-99', 'min': '-100'})
+    (3, (), {'max': '3', 'min': '1'})
+    (3, ('3', '6'), {'test': '36'})
+    (3, ('3', '6'), {'test': 'a, b, c'})
+    (3, ('3',), {'test': ['a', 'b', 'c'], 'max': '3'})
+    (3, ('3',), {'test': ["'a'", 'b', 'x=(c)'], 'max': '3'})
+    (3, (), {'test': 'x=fish(3)'})
+    
+    >>> v = Validator()
+    >>> v.check('integer(default=6)', '3')
+    3
+    >>> v.check('integer(default=6)', None, True)
+    6
+    >>> v.get_default_value('integer(default=6)')
+    6
+    >>> v.get_default_value('float(default=6)')
+    6.0
+    >>> v.get_default_value('pass(default=None)')
+    >>> v.get_default_value("string(default='None')")
+    'None'
+    >>> v.get_default_value('pass')
+    Traceback (most recent call last):
+    KeyError: 'Check "pass" has no default value.'
+    >>> v.get_default_value('pass(default=list(1, 2, 3, 4))')
+    ['1', '2', '3', '4']
+    
+    >>> v = Validator()
+    >>> v.check("pass(default=None)", None, True)
+    >>> v.check("pass(default='None')", None, True)
+    'None'
+    >>> v.check('pass(default="None")', None, True)
+    'None'
+    >>> v.check('pass(default=list(1, 2, 3, 4))', None, True)
+    ['1', '2', '3', '4']
+    
+    Bug test for unicode arguments
+    >>> v = Validator()
+    >>> v.check(u'string(min=4)', u'test')
+    u'test'
+    
+    >>> v = Validator()
+    >>> v.get_default_value(u'string(min=4, default="1234")')
+    u'1234'
+    >>> v.check(u'string(min=4, default="1234")', u'test')
+    u'test'
+    
+    >>> v = Validator()
+    >>> default = v.get_default_value('string(default=None)')
+    >>> default == None
+    1
+    """
+    return (value, args, keywargs)
+
+
+if __name__ == '__main__':
+    # run the code tests in doctest format
+    import doctest
+    m = sys.modules.get('__main__')
+    globs = m.__dict__.copy()
+    globs.update({
+        'INTP_VER': INTP_VER,
+        'vtor': Validator(),
+    })
+    doctest.testmod(m, globs=globs)
diff --git a/IPython/external/guid.py b/IPython/external/guid.py
new file mode 100644
index 0000000..da1a226
--- /dev/null
+++ b/IPython/external/guid.py
@@ -0,0 +1,170 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+# GUID.py
+# Version 2.6
+#
+# Copyright (c) 2006 Conan C. Albrecht
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy 
+# of this software and associated documentation files (the "Software"), to deal 
+# in the Software without restriction, including without limitation the rights 
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+# copies of the Software, and to permit persons to whom the Software is furnished 
+# to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all 
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# DEALINGS IN THE SOFTWARE.
+
+
+
+##################################################################################################
+###   A globally-unique identifier made up of time and ip and 8 digits for a counter: 
+###   each GUID is 40 characters wide
+###
+###   A globally unique identifier that combines ip, time, and a counter.  Since the 
+###   time is listed first, you can sort records by guid.  You can also extract the time 
+###   and ip if needed.  
+###
+###   Since the counter has eight hex characters, you can create up to 
+###   0xffffffff (4294967295) GUIDs every millisecond.  If your processor
+###   is somehow fast enough to create more than that in a millisecond (looking
+###   toward the future, of course), the function will wait until the next
+###   millisecond to return.
+###     
+###   GUIDs make wonderful database keys.  They require no access to the 
+###   database (to get the max index number), they are extremely unique, and they sort 
+###   automatically by time.   GUIDs prevent key clashes when merging
+###   two databases together, combining data, or generating keys in distributed
+###   systems.
+###
+###   There is an Internet Draft for UUIDs, but this module does not implement it.
+###   If the draft catches on, perhaps I'll conform the module to it.
+###
+
+
+# Changelog
+# Sometime, 1997     Created the Java version of GUID
+#                    Went through many versions in Java
+# Sometime, 2002     Created the Python version of GUID, mirroring the Java version
+# November 24, 2003  Changed Python version to be more pythonic, took out object and made just a module
+# December 2, 2003   Fixed duplicating GUIDs.  Sometimes they duplicate if multiples are created
+#                    in the same millisecond (it checks the last 100 GUIDs now and has a larger random part)
+# December 9, 2003   Fixed MAX_RANDOM, which was going over sys.maxint
+# June 12, 2004      Allowed a custom IP address to be sent in rather than always using the 
+#                    local IP address.  
+# November 4, 2005   Changed the random part to a counter variable.  Now GUIDs are totally 
+#                    unique and more efficient, as long as they are created by only
+#                    on runtime on a given machine.  The counter part is after the time
+#                    part so it sorts correctly.
+# November 8, 2005   The counter variable now starts at a random long now and cycles
+#                    around.  This is in case two guids are created on the same
+#                    machine at the same millisecond (by different processes).  Even though
+#                    it is possible the GUID can be created, this makes it highly unlikely
+#                    since the counter will likely be different.
+# November 11, 2005  Fixed a bug in the new IP getting algorithm.  Also, use IPv6 range
+#                    for IP when we make it up (when it's no accessible)
+# November 21, 2005  Added better IP-finding code.  It finds IP address better now.
+# January 5, 2006    Fixed a small bug caused in old versions of python (random module use)
+
+import math
+import socket
+import random
+import sys
+import time
+import threading
+
+
+
+#############################
+###   global module variables
+
+#Makes a hex IP from a decimal dot-separated ip (eg: 127.0.0.1)
+make_hexip = lambda ip: ''.join(["%04x" % long(i) for i in ip.split('.')]) # leave space for ip v6 (65K in each sub)
+  
+MAX_COUNTER = 0xfffffffe
+counter = 0L
+firstcounter = MAX_COUNTER
+lasttime = 0
+ip = ''
+lock = threading.RLock()
+try:  # only need to get the IP addresss once
+  ip = socket.getaddrinfo(socket.gethostname(),0)[-1][-1][0]
+  hexip = make_hexip(ip)
+except: # if we don't have an ip, default to someting in the 10.x.x.x private range
+  ip = '10'
+  rand = random.Random()
+  for i in range(3):
+    ip += '.' + str(rand.randrange(1, 0xffff))  # might as well use IPv6 range if we're making it up
+  hexip = make_hexip(ip)
+
+  
+#################################
+###   Public module functions
+
+def generate(ip=None):
+  '''Generates a new guid.  A guid is unique in space and time because it combines
+     the machine IP with the current time in milliseconds.  Be careful about sending in
+     a specified IP address because the ip makes it unique in space.  You could send in
+     the same IP address that is created on another machine.
+  '''
+  global counter, firstcounter, lasttime
+  lock.acquire() # can't generate two guids at the same time
+  try:
+    parts = []
+
+    # do we need to wait for the next millisecond (are we out of counters?)
+    now = long(time.time() * 1000)
+    while lasttime == now and counter == firstcounter: 
+      time.sleep(.01)
+      now = long(time.time() * 1000)
+
+    # time part
+    parts.append("%016x" % now)
+
+    # counter part
+    if lasttime != now:  # time to start counter over since we have a different millisecond
+      firstcounter = long(random.uniform(1, MAX_COUNTER))  # start at random position
+      counter = firstcounter
+    counter += 1
+    if counter > MAX_COUNTER:
+      counter = 0
+    lasttime = now
+    parts.append("%08x" % (counter)) 
+
+    # ip part
+    parts.append(hexip)
+
+    # put them all together
+    return ''.join(parts)
+  finally:
+    lock.release()
+    
+
+def extract_time(guid):
+  '''Extracts the time portion out of the guid and returns the 
+     number of seconds since the epoch as a float'''
+  return float(long(guid[0:16], 16)) / 1000.0
+
+
+def extract_counter(guid):
+  '''Extracts the counter from the guid (returns the bits in decimal)'''
+  return int(guid[16:24], 16)
+
+
+def extract_ip(guid):
+  '''Extracts the ip portion out of the guid and returns it
+     as a string like 10.10.10.10'''
+  # there's probably a more elegant way to do this
+  thisip = []
+  for index in range(24, 40, 4):
+    thisip.append(str(int(guid[index: index + 4], 16)))
+  return '.'.join(thisip)
+
diff --git a/IPython/kernel/__init__.py b/IPython/kernel/__init__.py
new file mode 100755
index 0000000..2d646ad
--- /dev/null
+++ b/IPython/kernel/__init__.py
@@ -0,0 +1,23 @@
+# encoding: utf-8
+"""The IPython1 kernel.
+
+The IPython kernel actually refers to three things:
+
+ * The IPython Engine
+ * The IPython Controller
+ * Clients to the IPython Controller
+
+The kernel module implements the engine, controller and client and all the 
+network protocols needed for the various entities to talk to each other.
+
+An end user should probably begin by looking at the `client.py` module
+if they need blocking clients or in `asyncclient.py` if they want asynchronous,
+deferred/Twisted using clients.
+"""
+__docformat__ = "restructuredtext en"
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/kernel/asyncclient.py b/IPython/kernel/asyncclient.py
new file mode 100644
index 0000000..a1542e2
--- /dev/null
+++ b/IPython/kernel/asyncclient.py
@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+"""Asynchronous clients for the IPython controller.
+
+This module has clients for using the various interfaces of the controller 
+in a fully asynchronous manner.  This means that you will need to run the
+Twisted reactor yourself and that all methods of the client classes return
+deferreds to the result.
+
+The main methods are are `get_*_client` and `get_client`.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.kernel import codeutil
+from IPython.kernel.clientconnector import ClientConnector
+
+# Other things that the user will need
+from IPython.kernel.task import Task
+from IPython.kernel.error import CompositeError
+
+#-------------------------------------------------------------------------------
+# Code
+#-------------------------------------------------------------------------------
+
+_client_tub = ClientConnector()
+get_multiengine_client = _client_tub.get_multiengine_client
+get_task_client = _client_tub.get_task_client
+get_client = _client_tub.get_client
+
diff --git a/IPython/kernel/client.py b/IPython/kernel/client.py
new file mode 100644
index 0000000..85d677b
--- /dev/null
+++ b/IPython/kernel/client.py
@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+"""This module contains blocking clients for the controller interfaces.
+
+Unlike the clients in `asyncclient.py`, the clients in this module are fully
+blocking.  This means that methods on the clients return the actual results
+rather than a deferred to the result.  Also, we manage the Twisted reactor
+for you.  This is done by running the reactor in a thread.
+
+The main classes in this module are:
+
+    * MultiEngineClient
+    * TaskClient
+    * Task
+    * CompositeError
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import sys
+
+# from IPython.tools import growl
+# growl.start("IPython1 Client")
+
+
+from twisted.internet import reactor
+from IPython.kernel.clientconnector import ClientConnector
+from IPython.kernel.twistedutil import ReactorInThread
+from IPython.kernel.twistedutil import blockingCallFromThread
+
+# These enable various things 
+from IPython.kernel import codeutil
+import IPython.kernel.magic
+
+# Other things that the user will need
+from IPython.kernel.task import Task
+from IPython.kernel.error import CompositeError
+
+#-------------------------------------------------------------------------------
+# Code
+#-------------------------------------------------------------------------------
+
+_client_tub = ClientConnector()
+
+
+def get_multiengine_client(furl_or_file=''):
+    """Get the blocking MultiEngine client.
+    
+    :Parameters:
+        furl_or_file : str
+            A furl or a filename containing a furl.  If empty, the
+            default furl_file will be used
+            
+    :Returns:
+        The connected MultiEngineClient instance
+    """
+    client = blockingCallFromThread(_client_tub.get_multiengine_client, 
+        furl_or_file)
+    return client.adapt_to_blocking_client()
+
+def get_task_client(furl_or_file=''):
+    """Get the blocking Task client.
+    
+    :Parameters:
+        furl_or_file : str
+            A furl or a filename containing a furl.  If empty, the
+            default furl_file will be used
+            
+    :Returns:
+        The connected TaskClient instance
+    """
+    client = blockingCallFromThread(_client_tub.get_task_client, 
+        furl_or_file)
+    return client.adapt_to_blocking_client()
+
+
+MultiEngineClient = get_multiengine_client
+TaskClient = get_task_client
+
+
+
+# Now we start the reactor in a thread
+rit = ReactorInThread()
+rit.setDaemon(True)
+rit.start()
\ No newline at end of file
diff --git a/IPython/kernel/clientconnector.py b/IPython/kernel/clientconnector.py
new file mode 100644
index 0000000..595a353
--- /dev/null
+++ b/IPython/kernel/clientconnector.py
@@ -0,0 +1,150 @@
+# encoding: utf-8
+
+"""A class for handling client connections to the controller."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.kernel.config import config_manager as kernel_config_manager
+from IPython.config.cutils import import_item
+from IPython.kernel.fcutil import find_furl
+
+co = kernel_config_manager.get_config_obj()
+client_co = co['client']
+
+#-------------------------------------------------------------------------------
+# The ClientConnector class
+#-------------------------------------------------------------------------------
+
+class ClientConnector(object):
+    """
+    This class gets remote references from furls and returns the wrapped clients.
+    
+    This class is also used in `client.py` and `asyncclient.py` to create 
+    a single per client-process Tub.
+    """
+    
+    def __init__(self):
+        self._remote_refs = {}
+        self.tub = Tub()
+        self.tub.startService()
+    
+    def get_reference(self, furl_or_file):
+        """
+        Get a remote reference using a furl or a file containing a furl.
+        
+        Remote references are cached locally so once a remote reference
+        has been retrieved for a given furl, the cached version is 
+        returned.
+        
+        :Parameters:
+            furl_or_file : str
+                A furl or a filename containing a furl
+        
+        :Returns:
+            A deferred to a remote reference
+        """
+        furl = find_furl(furl_or_file)
+        if furl in self._remote_refs:
+            d = defer.succeed(self._remote_refs[furl])
+        else:
+            d = self.tub.getReference(furl)
+            d.addCallback(self.save_ref, furl)
+        return d
+        
+    def save_ref(self, ref, furl):
+        """
+        Cache a remote reference by its furl.
+        """
+        self._remote_refs[furl] = ref
+        return ref
+        
+    def get_task_client(self, furl_or_file=''):
+        """
+        Get the task controller client.
+        
+        This method is a simple wrapper around `get_client` that allow
+        `furl_or_file` to be empty, in which case, the furls is taken
+        from the default furl file given in the configuration.
+        
+        :Parameters:
+            furl_or_file : str
+                A furl or a filename containing a furl.  If empty, the
+                default furl_file will be used
+                
+        :Returns:
+            A deferred to the actual client class
+        """
+        task_co = client_co['client_interfaces']['task']
+        if furl_or_file:
+            ff = furl_or_file
+        else:
+            ff = task_co['furl_file']
+        return self.get_client(ff)
+
+    def get_multiengine_client(self, furl_or_file=''):
+        """
+        Get the multiengine controller client.
+        
+        This method is a simple wrapper around `get_client` that allow
+        `furl_or_file` to be empty, in which case, the furls is taken
+        from the default furl file given in the configuration.
+        
+        :Parameters:
+            furl_or_file : str
+                A furl or a filename containing a furl.  If empty, the
+                default furl_file will be used
+                
+        :Returns:
+            A deferred to the actual client class
+        """
+        task_co = client_co['client_interfaces']['multiengine']
+        if furl_or_file:
+            ff = furl_or_file
+        else:
+            ff = task_co['furl_file']
+        return self.get_client(ff)
+    
+    def get_client(self, furl_or_file):
+        """
+        Get a remote reference and wrap it in a client by furl.
+        
+        This method first gets a remote reference and then calls its 
+        `get_client_name` method to find the apprpriate client class
+        that should be used to wrap the remote reference.
+        
+        :Parameters:
+            furl_or_file : str
+                A furl or a filename containing a furl
+        
+        :Returns:
+            A deferred to the actual client class
+        """
+        furl = find_furl(furl_or_file)
+        d = self.get_reference(furl)
+        def wrap_remote_reference(rr):
+            d = rr.callRemote('get_client_name')
+            d.addCallback(lambda name: import_item(name))
+            def adapt(client_interface):
+                client = client_interface(rr)
+                client.tub = self.tub
+                return client
+            d.addCallback(adapt)
+
+            return d
+        d.addCallback(wrap_remote_reference)
+        return d
diff --git a/IPython/kernel/clientinterfaces.py b/IPython/kernel/clientinterfaces.py
new file mode 100644
index 0000000..248e511
--- /dev/null
+++ b/IPython/kernel/clientinterfaces.py
@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+"""General client interfaces."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from zope.interface import Interface, implements
+
+class IFCClientInterfaceProvider(Interface):
+
+    def remote_get_client_name():
+        """Return a string giving the class which implements a client-side interface.
+        
+        The client side of any foolscap connection initially gets a remote reference.
+        Some class is needed to adapt that reference to an interface.  This...
+        """
+
+class IBlockingClientAdaptor(Interface):
+    
+    def adapt_to_blocking_client():
+        """"""
\ No newline at end of file
diff --git a/IPython/kernel/codeutil.py b/IPython/kernel/codeutil.py
new file mode 100644
index 0000000..31e0361
--- /dev/null
+++ b/IPython/kernel/codeutil.py
@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+"""Utilities to enable code objects to be pickled.
+
+Any process that import this module will be able to pickle code objects.  This
+includes the func_code attribute of any function.  Once unpickled, new 
+functions can be built using new.function(code, globals()).  Eventually
+we need to automate all of this so that functions themselves can be pickled.
+
+Reference: A. Tremols, P Cogolo, "Python Cookbook," p 302-305
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import new, types, copy_reg
+
+def code_ctor(*args):
+    return new.code(*args)
+    
+def reduce_code(co):
+    if co.co_freevars or co.co_cellvars:
+        raise ValueError("Sorry, cannot pickle code objects with closures")
+    return code_ctor, (co.co_argcount, co.co_nlocals, co.co_stacksize,
+        co.co_flags, co.co_code, co.co_consts, co.co_names,
+        co.co_varnames, co.co_filename, co.co_name, co.co_firstlineno,
+        co.co_lnotab)
+
+copy_reg.pickle(types.CodeType, reduce_code)
\ No newline at end of file
diff --git a/IPython/kernel/config/__init__.py b/IPython/kernel/config/__init__.py
new file mode 100644
index 0000000..efc8d0a
--- /dev/null
+++ b/IPython/kernel/config/__init__.py
@@ -0,0 +1,125 @@
+# encoding: utf-8
+
+"""Default kernel configuration."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.external.configobj import ConfigObj
+from IPython.config.api import ConfigObjManager
+from IPython.config.cutils import get_ipython_dir
+
+default_kernel_config = ConfigObj()
+
+try:
+    ipython_dir = get_ipython_dir() + '/'
+except:
+    # This will defaults to the cwd
+    ipython_dir = ''
+
+#-------------------------------------------------------------------------------
+# Engine Configuration
+#-------------------------------------------------------------------------------
+
+engine_config = dict(
+    logfile = '',    # Empty means log to stdout
+    furl_file = ipython_dir + 'ipcontroller-engine.furl'
+)
+
+#-------------------------------------------------------------------------------
+# MPI Configuration
+#-------------------------------------------------------------------------------
+
+mpi_config = dict(
+    mpi4py = """from mpi4py import MPI as mpi
+mpi.size = mpi.COMM_WORLD.Get_size()
+mpi.rank = mpi.COMM_WORLD.Get_rank()
+""",
+    pytrilinos = """from PyTrilinos import Epetra
+class SimpleStruct:
+    pass
+mpi = SimpleStruct()
+mpi.rank = 0
+mpi.size = 0
+""",
+    default = ''
+)
+
+#-------------------------------------------------------------------------------
+# Controller Configuration
+#-------------------------------------------------------------------------------
+
+controller_config = dict(
+
+    logfile = '',    # Empty means log to stdout
+    import_statement = '',
+
+    engine_tub = dict(
+        ip = '',         # Empty string means all interfaces
+        port = 0,        # 0 means pick a port for me
+        location = '',    # Empty string means try to set automatically
+        secure = True,
+        cert_file = ipython_dir + 'ipcontroller-engine.pem',
+    ),
+    engine_fc_interface = 'IPython.kernel.enginefc.IFCControllerBase',
+    engine_furl_file = ipython_dir + 'ipcontroller-engine.furl',
+    
+    controller_interfaces = dict(
+        # multiengine = dict(
+        #     controller_interface = 'IPython.kernel.multiengine.IMultiEngine',
+        #     fc_interface = 'IPython.kernel.multienginefc.IFCMultiEngine',
+        #     furl_file = 'ipcontroller-mec.furl'
+        # ),
+        task = dict(
+            controller_interface = 'IPython.kernel.task.ITaskController',
+            fc_interface = 'IPython.kernel.taskfc.IFCTaskController',
+            furl_file = ipython_dir + 'ipcontroller-tc.furl'
+        ),
+        multiengine = dict(
+            controller_interface = 'IPython.kernel.multiengine.IMultiEngine',
+            fc_interface = 'IPython.kernel.multienginefc.IFCSynchronousMultiEngine',
+            furl_file = ipython_dir + 'ipcontroller-mec.furl'
+        )
+    ),
+
+    client_tub = dict(
+        ip = '',         # Empty string means all interfaces
+        port = 0,        # 0 means pick a port for me
+        location = '',    # Empty string means try to set automatically
+        secure = True,
+        cert_file = ipython_dir + 'ipcontroller-client.pem'
+    )
+)
+
+#-------------------------------------------------------------------------------
+# Client Configuration
+#-------------------------------------------------------------------------------
+
+client_config = dict(
+    client_interfaces = dict(
+        task = dict(
+            furl_file = ipython_dir + 'ipcontroller-tc.furl'
+        ),
+        multiengine = dict(
+            furl_file = ipython_dir + 'ipcontroller-mec.furl'
+        )
+    )
+)
+
+default_kernel_config['engine'] = engine_config
+default_kernel_config['mpi'] = mpi_config
+default_kernel_config['controller'] = controller_config
+default_kernel_config['client'] = client_config
+
+
+config_manager = ConfigObjManager(default_kernel_config, 'IPython.kernel.ini')
\ No newline at end of file
diff --git a/IPython/kernel/contexts.py b/IPython/kernel/contexts.py
new file mode 100644
index 0000000..040102b
--- /dev/null
+++ b/IPython/kernel/contexts.py
@@ -0,0 +1,178 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_contexts -*-
+"""Context managers for IPython.
+
+Python 2.5 introduced the `with` statement, which is based on the context
+manager protocol.  This module offers a few context managers for common cases,
+which can also be useful as templates for writing new, application-specific
+managers.
+"""
+
+from __future__ import with_statement
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import linecache
+import sys
+
+from twisted.internet.error import ConnectionRefusedError
+
+from IPython.ultraTB import _fixed_getinnerframes, findsource
+from IPython import ipapi
+
+from IPython.kernel import error
+
+#---------------------------------------------------------------------------
+# Utility functions needed by all context managers.
+#---------------------------------------------------------------------------
+
+def remote():
+    """Raises a special exception meant to be caught by context managers.
+    """
+    m = 'Special exception to stop local execution of parallel code.'
+    raise error.StopLocalExecution(m)
+
+
+def strip_whitespace(source,require_remote=True):
+    """strip leading whitespace from input source.
+
+    :Parameters:
+    
+    """
+    remote_mark = 'remote()'
+    # Expand tabs to avoid any confusion.
+    wsource = [l.expandtabs(4) for l in source]
+    # Detect the indentation level
+    done = False
+    for line in wsource:
+        if line.isspace():
+            continue
+        for col,char in enumerate(line):
+            if char != ' ':
+                done = True
+                break
+        if done:
+            break
+    # Now we know how much leading space there is in the code.  Next, we
+    # extract up to the first line that has less indentation.
+    # WARNINGS: we skip comments that may be misindented, but we do NOT yet
+    # detect triple quoted strings that may have flush left text.
+    for lno,line in enumerate(wsource):
+        lead = line[:col]
+        if lead.isspace():
+            continue
+        else:
+            if not lead.lstrip().startswith('#'):
+                break
+    # The real 'with' source is up to lno
+    src_lines = [l[col:] for l in wsource[:lno+1]]
+
+    # Finally, check that the source's first non-comment line begins with the
+    # special call 'remote()'
+    if require_remote:
+        for nline,line in enumerate(src_lines):
+            if line.isspace() or line.startswith('#'):
+                continue
+            if line.startswith(remote_mark):
+                break
+            else:
+                raise ValueError('%s call missing at the start of code' %
+                                 remote_mark)
+        out_lines = src_lines[nline+1:]
+    else:
+        # If the user specified that the remote() call wasn't mandatory
+        out_lines = src_lines
+
+    # src = ''.join(out_lines)  # dbg
+    #print 'SRC:\n<<<<<<<>>>>>>>\n%s<<<<<>>>>>>' % src  # dbg
+    return ''.join(out_lines)
+
+class RemoteContextBase(object):
+    def __init__(self):
+        self.ip = ipapi.get()
+    
+    def _findsource_file(self,f):
+        linecache.checkcache()
+        s = findsource(f.f_code)
+        lnum = f.f_lineno
+        wsource = s[0][f.f_lineno:]
+        return strip_whitespace(wsource)
+
+    def _findsource_ipython(self,f):
+        from IPython import ipapi
+        self.ip = ipapi.get()
+        buf = self.ip.IP.input_hist_raw[-1].splitlines()[1:]
+        wsource = [l+'\n' for l in buf ] 
+                   
+        return strip_whitespace(wsource)
+        
+    def findsource(self,frame):
+        local_ns = frame.f_locals
+        global_ns = frame.f_globals
+        if frame.f_code.co_filename == '<ipython console>':
+            src = self._findsource_ipython(frame)
+        else:
+            src = self._findsource_file(frame)
+        return src
+
+    def __enter__(self):
+        raise NotImplementedError
+        
+    def __exit__ (self, etype, value, tb):
+        if issubclass(etype,error.StopLocalExecution):
+            return True
+
+class RemoteMultiEngine(RemoteContextBase):
+    def __init__(self,mec):
+        self.mec = mec
+        RemoteContextBase.__init__(self)
+
+    def __enter__(self):
+        src = self.findsource(sys._getframe(1))
+        return self.mec.execute(src)
+
+
+# XXX - Temporary hackish testing, we'll move this into proper tests right
+# away
+
+if __name__ == '__main__':
+
+    # XXX - for now, we need a running cluster to be started separately.  The
+    # daemon work is almost finished, and will make much of this unnecessary.
+    from IPython.kernel import client
+    mec = client.MultiEngineClient(('127.0.0.1',10105))
+
+    try:
+        mec.get_ids()
+    except ConnectionRefusedError:
+        import os, time
+        os.system('ipcluster -n 2 &')
+        time.sleep(2)
+        mec = client.MultiEngineClient(('127.0.0.1',10105))
+
+    mec.block = False
+
+    import itertools
+    c = itertools.count()
+
+    parallel = RemoteMultiEngine(mec)
+
+    with parallel as pr:
+        # A comment
+        remote()  # this means the code below only runs remotely
+        print 'Hello remote world'
+        x = 3.14
+        # Comments are OK
+        # Even misindented.
+        y = x+1
diff --git a/IPython/kernel/controllerservice.py b/IPython/kernel/controllerservice.py
new file mode 100644
index 0000000..c341da6
--- /dev/null
+++ b/IPython/kernel/controllerservice.py
@@ -0,0 +1,376 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_controllerservice -*-
+
+"""A Twisted Service for the IPython Controller.
+
+The IPython Controller:
+
+* Listens for Engines to connect and then manages access to those engines.
+* Listens for clients and passes commands from client to the Engines.
+* Exposes an asynchronous interfaces to the Engines which themselves can block.
+* Acts as a gateway to the Engines.
+
+The design of the controller is somewhat abstract to allow flexibility in how 
+the controller is presented to clients.  This idea is that there is a basic
+ControllerService class that allows engines to connect to it.  But, this 
+basic class has no client interfaces.  To expose client interfaces developers
+provide an adapter that makes the ControllerService look like something.  For 
+example, one client interface might support task farming and another might
+support interactive usage.  The important thing is that by using interfaces
+and adapters, a single controller can be accessed from multiple interfaces.
+Furthermore, by adapting various client interfaces to various network
+protocols, each client interface can be exposed to multiple network protocols.
+See multiengine.py for an example of how to adapt the ControllerService
+to a client interface.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os, sys
+
+from twisted.application import service
+from twisted.internet import defer, reactor
+from twisted.python import log, components
+from zope.interface import Interface, implements, Attribute
+import zope.interface as zi
+
+from IPython.kernel.engineservice import \
+    IEngineCore, \
+    IEngineSerialized, \
+    IEngineQueued
+    
+from IPython.config import cutils
+from IPython.kernel import codeutil
+
+#-------------------------------------------------------------------------------
+# Interfaces for the Controller
+#-------------------------------------------------------------------------------
+
+class IControllerCore(Interface):
+    """Basic methods any controller must have.
+    
+    This is basically the aspect of the controller relevant to the 
+    engines and does not assume anything about how the engines will
+    be presented to a client.
+    """
+        
+    engines = Attribute("A dict of engine ids and engine instances.")
+        
+    def register_engine(remoteEngine, id=None, ip=None, port=None, 
+        pid=None):
+        """Register new remote engine.
+        
+        The controller can use the ip, port, pid of the engine to do useful things
+        like kill the engines.
+        
+        :Parameters:
+            remoteEngine
+                An implementer of IEngineCore, IEngineSerialized and IEngineQueued.
+            id : int
+                Requested id.
+            ip : str
+                IP address the engine is running on.
+            port : int
+                Port the engine is on.
+            pid : int
+                pid of the running engine.
+        
+        :Returns: A dict of {'id':id} and possibly other key, value pairs.
+        """
+    
+    def unregister_engine(id):
+        """Handle a disconnecting engine.
+        
+        :Parameters:
+            id
+                The integer engine id of the engine to unregister.
+        """
+        
+    def on_register_engine_do(f, includeID, *args, **kwargs):
+        """Call ``f(*args, **kwargs)`` when an engine is registered.
+        
+        :Parameters:
+            includeID : int
+                If True the first argument to f will be the id of the engine.
+        """
+            
+    def on_unregister_engine_do(f, includeID, *args, **kwargs):
+        """Call ``f(*args, **kwargs)`` when an engine is unregistered.
+        
+        :Parameters:
+            includeID : int
+                If True the first argument to f will be the id of the engine.
+        """
+    
+    def on_register_engine_do_not(f):
+        """Stop calling f on engine registration"""
+    
+    def on_unregister_engine_do_not(f):
+        """Stop calling f on engine unregistration"""
+        
+    def on_n_engines_registered_do(n, f, *arg, **kwargs):
+        """Call f(*args, **kwargs) the first time the nth engine registers."""
+                    
+class IControllerBase(IControllerCore):
+    """The basic controller interface."""
+    pass 
+
+
+#-------------------------------------------------------------------------------
+# Implementation of the ControllerService
+#-------------------------------------------------------------------------------
+
+class ControllerService(object, service.Service):
+    """A basic Controller represented as a Twisted Service.
+    
+    This class doesn't implement any client notification mechanism.  That
+    is up to adapted subclasses.
+    """
+    
+    # I also pick up the IService interface by inheritance from service.Service
+    implements(IControllerBase)
+    name = 'ControllerService'
+    
+    def __init__(self, maxEngines=511, saveIDs=False):
+        self.saveIDs = saveIDs
+        self.engines = {}
+        self.availableIDs = range(maxEngines,-1,-1)   # [511,...,0]
+        self._onRegister = []
+        self._onUnregister = []
+        self._onNRegistered = []
+    
+    #---------------------------------------------------------------------------
+    # Methods used to save the engine info to a log file
+    #---------------------------------------------------------------------------
+    
+    def _buildEngineInfoString(self, id, ip, port, pid):
+        if id is None:
+            id = -99
+        if ip is None:
+            ip = "-99"
+        if port is None:
+            port = -99
+        if pid is None:
+            pid = -99
+        return "Engine Info: %d %s %d %d" % (id, ip , port, pid)
+        
+    def _logEngineInfo(self, id, ip, port, pid):
+        log.msg(self._buildEngineInfoString(id,ip,port,pid))
+    
+    def _getEngineInfoLogFile(self):
+        # Store all logs inside the ipython directory
+        ipdir = cutils.get_ipython_dir()
+        pjoin = os.path.join
+        logdir_base = pjoin(ipdir,'log')
+        if not os.path.isdir(logdir_base):
+            os.makedirs(logdir_base)
+        logfile = os.path.join(logdir_base,'ipcontroller-%s-engine-info.log' % os.getpid())
+        return logfile
+    
+    def _logEngineInfoToFile(self, id, ip, port, pid):
+        """Log info about an engine to a log file.
+        
+        When an engine registers with a ControllerService, the ControllerService
+        saves information about the engine to a log file.  That information
+        can be useful for various purposes, such as killing hung engines, etc.
+        
+        This method takes the assigned id, ip/port and pid of the engine
+        and saves it to a file of the form:
+        
+        ~/.ipython/log/ipcontroller-###-engine-info.log
+        
+        where ### is the pid of the controller.
+        
+        Each line of this file has the form:
+        
+        Engine Info: ip ip port pid
+        
+        If any of the entries are not known, they are replaced by -99.
+        """
+        
+        fname = self._getEngineInfoLogFile()
+        f = open(fname, 'a')
+        s = self._buildEngineInfoString(id,ip,port,pid)
+        f.write(s + '\n')
+        f.close()
+    
+    #---------------------------------------------------------------------------
+    # IControllerCore methods
+    #---------------------------------------------------------------------------
+        
+    def register_engine(self, remoteEngine, id=None,
+        ip=None, port=None, pid=None):
+        """Register new engine connection"""
+        
+        # What happens if these assertions fail?
+        assert IEngineCore.providedBy(remoteEngine), \
+            "engine passed to register_engine doesn't provide IEngineCore"
+        assert IEngineSerialized.providedBy(remoteEngine), \
+            "engine passed to register_engine doesn't provide IEngineSerialized"
+        assert IEngineQueued.providedBy(remoteEngine), \
+            "engine passed to register_engine doesn't provide IEngineQueued"
+        assert isinstance(id, int) or id is None, \
+            "id to register_engine must be an integer or None"
+        assert isinstance(ip, str) or ip is None, \
+            "ip to register_engine must be a string or None"
+        assert isinstance(port, int) or port is None, \
+            "port to register_engine must be an integer or None"
+        assert isinstance(pid, int) or pid is None, \
+            "pid to register_engine must be an integer or None"
+            
+        desiredID = id
+        if desiredID in self.engines.keys():
+            desiredID = None
+            
+        if desiredID in self.availableIDs:
+            getID = desiredID
+            self.availableIDs.remove(desiredID)
+        else:
+            getID = self.availableIDs.pop()
+        remoteEngine.id = getID
+        remoteEngine.service = self
+        self.engines[getID] = remoteEngine
+
+        # Log the Engine Information for monitoring purposes
+        self._logEngineInfoToFile(getID, ip, port, pid)
+
+        msg = "registered engine with id: %i" %getID
+        log.msg(msg)
+        
+        for i in range(len(self._onRegister)):
+            (f,args,kwargs,ifid) = self._onRegister[i]
+            try:
+                if ifid:
+                    f(getID, *args, **kwargs)
+                else:
+                    f(*args, **kwargs)
+            except:
+                self._onRegister.pop(i)
+        
+        # Call functions when the nth engine is registered and them remove them
+        for i, (n, f, args, kwargs) in enumerate(self._onNRegistered):
+            if len(self.engines.keys()) == n:
+                try:
+                    try:
+                        f(*args, **kwargs)
+                    except:
+                        log.msg("Function %r failed when the %ith engine registered" % (f, n))
+                finally:
+                    self._onNRegistered.pop(i)
+        
+        return {'id':getID}
+    
+    def unregister_engine(self, id):
+        """Unregister engine by id."""
+        
+        assert isinstance(id, int) or id is None, \
+            "id to unregister_engine must be an integer or None"
+        
+        msg = "unregistered engine with id: %i" %id
+        log.msg(msg)
+        try:
+            del self.engines[id]
+        except KeyError:
+            log.msg("engine with id %i was not registered" % id)
+        else:
+            if not self.saveIDs:
+                self.availableIDs.append(id)
+                # Sort to assign lower ids first
+                self.availableIDs.sort(reverse=True) 
+            else:
+                log.msg("preserving id %i" %id)
+            
+            for i in range(len(self._onUnregister)):
+                (f,args,kwargs,ifid) = self._onUnregister[i]
+                try:
+                    if ifid:
+                        f(id, *args, **kwargs)
+                    else:
+                        f(*args, **kwargs)
+                except:
+                    self._onUnregister.pop(i)
+    
+    def on_register_engine_do(self, f, includeID, *args, **kwargs):
+        assert callable(f), "f must be callable"
+        self._onRegister.append((f,args,kwargs,includeID))
+
+    def on_unregister_engine_do(self, f, includeID, *args, **kwargs):
+        assert callable(f), "f must be callable"
+        self._onUnregister.append((f,args,kwargs,includeID))
+    
+    def on_register_engine_do_not(self, f):
+        for i in range(len(self._onRegister)):
+            g = self._onRegister[i][0]
+            if f == g:
+                self._onRegister.pop(i)
+                return
+    
+    def on_unregister_engine_do_not(self, f):
+        for i in range(len(self._onUnregister)):
+            g = self._onUnregister[i][0]
+            if f == g:
+                self._onUnregister.pop(i)
+                return
+
+    def on_n_engines_registered_do(self, n, f, *args, **kwargs):
+        if len(self.engines.keys()) >= n:
+            f(*args, **kwargs)
+        else:
+            self._onNRegistered.append((n,f,args,kwargs))
+            
+
+#-------------------------------------------------------------------------------
+# Base class for adapting controller to different client APIs
+#-------------------------------------------------------------------------------
+
+class ControllerAdapterBase(object):
+    """All Controller adapters should inherit from this class.
+    
+    This class provides a wrapped version of the IControllerBase interface that
+    can be used to easily create new custom controllers.  Subclasses of this
+    will provide a full implementation of IControllerBase.
+    
+    This class doesn't implement any client notification mechanism.  That
+    is up to subclasses.
+    """
+    
+    implements(IControllerBase)
+    
+    def __init__(self, controller):
+        self.controller = controller
+        # Needed for IControllerCore
+        self.engines = self.controller.engines
+        
+    def register_engine(self, remoteEngine, id=None,
+        ip=None, port=None, pid=None):
+        return self.controller.register_engine(remoteEngine, 
+            id, ip, port, pid)
+    
+    def unregister_engine(self, id):
+        return self.controller.unregister_engine(id)
+
+    def on_register_engine_do(self, f, includeID, *args, **kwargs):
+        return self.controller.on_register_engine_do(f, includeID, *args, **kwargs)
+
+    def on_unregister_engine_do(self, f, includeID, *args, **kwargs):
+        return self.controller.on_unregister_engine_do(f, includeID, *args, **kwargs)        
+    
+    def on_register_engine_do_not(self, f):
+        return self.controller.on_register_engine_do_not(f)
+    
+    def on_unregister_engine_do_not(self, f):
+        return self.controller.on_unregister_engine_do_not(f)        
+
+    def on_n_engines_registered_do(self, n, f, *args, **kwargs):
+        return self.controller.on_n_engines_registered_do(n, f, *args, **kwargs)
diff --git a/IPython/kernel/core/__init__.py b/IPython/kernel/core/__init__.py
new file mode 100644
index 0000000..0aad75d
--- /dev/null
+++ b/IPython/kernel/core/__init__.py
@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+"""The IPython Core."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/kernel/core/config/__init__.py b/IPython/kernel/core/config/__init__.py
new file mode 100644
index 0000000..6f60906
--- /dev/null
+++ b/IPython/kernel/core/config/__init__.py
@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.external.configobj import ConfigObj
+from IPython.config.api import ConfigObjManager
+
+default_core_config = ConfigObj()
+default_core_config['shell'] = dict(
+    shell_class = 'IPython.kernel.core.interpreter.Interpreter',
+    import_statement = ''
+)
+
+config_manager = ConfigObjManager(default_core_config, 'IPython.kernel.core.ini')
\ No newline at end of file
diff --git a/IPython/kernel/core/display_formatter.py b/IPython/kernel/core/display_formatter.py
new file mode 100644
index 0000000..55a04a9
--- /dev/null
+++ b/IPython/kernel/core/display_formatter.py
@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+"""Objects for replacing sys.displayhook()."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+class IDisplayFormatter(object):
+    """ Objects conforming to this interface will be responsible for formatting
+    representations of objects that pass through sys.displayhook() during an
+    interactive interpreter session.
+    """
+
+    # The kind of formatter.
+    kind = 'display'
+
+    # The unique identifier for this formatter.
+    identifier = None
+
+
+    def __call__(self, obj):
+        """ Return a formatted representation of an object.
+
+        Return None if one cannot return a representation in this format.
+        """
+
+        raise NotImplementedError
+
+
+class ReprDisplayFormatter(IDisplayFormatter):
+    """ Return the repr() string representation of an object.
+    """
+
+    # The unique identifier for this formatter.
+    identifier = 'repr'
+
+    
+    def __call__(self, obj):
+        """ Return a formatted representation of an object.
+        """
+
+        return repr(obj)
+
+
+class PPrintDisplayFormatter(IDisplayFormatter):
+    """ Return a pretty-printed string representation of an object.
+    """
+
+    # The unique identifier for this formatter.
+    identifier = 'pprint'
+
+    
+    def __call__(self, obj):
+        """ Return a formatted representation of an object.
+        """
+
+        import pprint
+        return pprint.pformat(obj)
+
+
diff --git a/IPython/kernel/core/display_trap.py b/IPython/kernel/core/display_trap.py
new file mode 100644
index 0000000..2d276c3
--- /dev/null
+++ b/IPython/kernel/core/display_trap.py
@@ -0,0 +1,100 @@
+# encoding: utf-8
+
+"""Manager for replacing sys.displayhook()."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+# Standard library imports.
+import sys
+
+
+
+class DisplayTrap(object):
+    """ Object to trap and format objects passing through sys.displayhook().
+
+    This trap maintains two lists of callables: formatters and callbacks. The
+    formatters take the *last* object that has gone through since the trap was
+    set and returns a string representation. Callbacks are executed on *every*
+    object that passes through the displayhook and does not return anything.
+    """
+
+    def __init__(self, formatters=None, callbacks=None):
+        # A list of formatters to apply. Each should be an instance conforming
+        # to the IDisplayFormatter interface.
+        if formatters is None:
+            formatters = []
+        self.formatters = formatters
+
+        # A list of callables, each of which should be executed *every* time an
+        # object passes through sys.displayhook().
+        if callbacks is None:
+            callbacks = []
+        self.callbacks = callbacks
+
+        # The last object to pass through the displayhook.
+        self.obj = None
+
+        # The previous hook before we replace it.
+        self.old_hook = None
+        
+    def hook(self, obj):
+        """ This method actually implements the hook.
+        """
+
+        # Run through the list of callbacks and trigger all of them.
+        for callback in self.callbacks:
+            callback(obj)
+
+        # Store the object for formatting.
+        self.obj = obj
+
+    def set(self):
+        """ Set the hook.
+        """
+
+        if sys.displayhook is not self.hook:
+            self.old_hook = sys.displayhook
+            sys.displayhook = self.hook
+
+    def unset(self):
+        """ Unset the hook.
+        """
+
+        sys.displayhook = self.old_hook
+
+    def clear(self):
+        """ Reset the stored object.
+        """
+
+        self.obj = None
+
+    def add_to_message(self, message):
+        """ Add the formatted display of the objects to the message dictionary
+        being returned from the interpreter to its listeners.
+        """
+
+        # If there was no displayed object (or simply None), then don't add
+        # anything.
+        if self.obj is None:
+            return
+
+        # Go through the list of formatters and let them add their formatting.
+        display = {}
+        for formatter in self.formatters:
+            representation = formatter(self.obj)
+            if representation is not None:
+                display[formatter.identifier] = representation
+
+        message['display'] = display
+
diff --git a/IPython/kernel/core/error.py b/IPython/kernel/core/error.py
new file mode 100644
index 0000000..50c2591
--- /dev/null
+++ b/IPython/kernel/core/error.py
@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+"""
+error.py
+
+We declare here a class hierarchy for all exceptions produced by IPython, in
+cases where we don't just raise one from the standard library.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+
+class IPythonError(Exception):
+    """Base exception that all of our exceptions inherit from.
+
+    This can be raised by code that doesn't have any more specific
+    information."""
+
+    pass
+
+# Exceptions associated with the controller objects
+class ControllerError(IPythonError): pass
+
+class ControllerCreationError(ControllerError): pass
+
+
+# Exceptions associated with the Engines
+class EngineError(IPythonError): pass
+
+class EngineCreationError(EngineError): pass
diff --git a/IPython/kernel/core/history.py b/IPython/kernel/core/history.py
new file mode 100644
index 0000000..1baa029
--- /dev/null
+++ b/IPython/kernel/core/history.py
@@ -0,0 +1,137 @@
+# encoding: utf-8
+
+""" Manage the input and output history of the interpreter and the
+frontend.
+
+There are 2 different history objects, one that lives in the interpreter,
+and one that lives in the frontend. They are synced with a diff at each
+execution of a command, as the interpreter history is a real stack, its
+existing entries are not mutable.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from copy import copy
+
+# Local imports.
+from util import InputList
+
+
+##############################################################################
+class History(object):
+    """ An object managing the input and output history.
+    """
+
+    def __init__(self, input_cache=None, output_cache=None):
+
+        # Stuff that IPython adds to the namespace.
+        self.namespace_additions = dict(
+            _ = None,
+            __ = None,
+            ___ = None,
+        )
+
+        # A list to store input commands.
+        if input_cache is None:
+            input_cache =InputList([])
+        self.input_cache = input_cache
+
+        # A dictionary to store trapped output.
+        if output_cache is None:
+            output_cache = {}
+        self.output_cache = output_cache
+
+    def get_history_item(self, index):
+        """ Returns the history string at index, where index is the
+        distance from the end (positive). 
+        """
+        if index>0 and index<len(self.input_cache):
+            return self.input_cache[index]
+
+
+##############################################################################
+class InterpreterHistory(History):
+    """ An object managing the input and output history at the interpreter
+    level.
+    """
+
+    def setup_namespace(self, namespace):
+        """ Add the input and output caches into the interpreter's namespace
+        with IPython-conventional names.
+
+        Parameters
+        ----------
+        namespace : dict
+        """
+
+        namespace['In'] = self.input_cache
+        namespace['_ih'] = self.input_cache
+        namespace['Out'] = self.output_cache
+        namespace['_oh'] = self.output_cache
+
+    def update_history(self, interpreter, python):
+        """ Update the history objects that this object maintains and the
+        interpreter's namespace.
+
+        Parameters
+        ----------
+        interpreter : Interpreter
+        python : str
+            The real Python code that was translated and actually executed.
+        """
+
+        number = interpreter.current_cell_number
+
+        new_obj = interpreter.display_trap.obj
+        if new_obj is not None:
+            self.namespace_additions['___'] = self.namespace_additions['__']
+            self.namespace_additions['__'] = self.namespace_additions['_']
+            self.namespace_additions['_'] = new_obj
+            self.output_cache[number] = new_obj
+
+        interpreter.user_ns.update(self.namespace_additions)
+        self.input_cache.add(number, python)
+
+
+    def get_history_item(self, index):
+        """ Returns the history string at index, where index is the
+        distance from the end (positive). 
+        """
+        if index>0 and index<(len(self.input_cache)-1):
+            return self.input_cache[-index]
+
+    def get_input_cache(self):
+        return copy(self.input_cache)
+
+    def get_input_after(self, index):
+        """ Returns the list of the commands entered after index.
+        """
+        # We need to call directly list.__getslice__, because this object
+        # is not a real list.
+        return list.__getslice__(self.input_cache, index,
+                                                len(self.input_cache))
+
+
+##############################################################################
+class FrontEndHistory(History):
+    """ An object managing the input and output history at the frontend.
+        It is used as a local cache to reduce network latency problems
+        and multiple users editing the same thing.
+    """
+
+    def add_items(self, item_list):
+        """ Adds the given command list to the stack of executed
+            commands.
+        """
+        self.input_cache.extend(item_list)
diff --git a/IPython/kernel/core/interpreter.py b/IPython/kernel/core/interpreter.py
new file mode 100644
index 0000000..6e1e8cd
--- /dev/null
+++ b/IPython/kernel/core/interpreter.py
@@ -0,0 +1,749 @@
+# encoding: utf-8
+
+"""Central interpreter object for an IPython engine.
+
+The interpreter is the object whose job is to process lines of user input and
+actually execute them in the user's namespace.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+# Standard library imports.
+from compiler.ast import Discard
+from types import FunctionType
+
+import __builtin__
+import codeop
+import compiler
+import pprint
+import sys
+import traceback
+
+# Local imports.
+from IPython.kernel.core import ultraTB
+from IPython.kernel.core.display_trap import DisplayTrap
+from IPython.kernel.core.macro import Macro
+from IPython.kernel.core.prompts import CachedOutput
+from IPython.kernel.core.traceback_trap import TracebackTrap
+from IPython.kernel.core.util import Bunch, system_shell
+from IPython.external.Itpl import ItplNS
+
+# Global constants
+COMPILER_ERROR = 'error'
+INCOMPLETE_INPUT = 'incomplete'
+COMPLETE_INPUT = 'complete'
+
+##############################################################################
+# TEMPORARY!!! fake configuration, while we decide whether to use tconfig or
+# not
+
+rc = Bunch()
+rc.cache_size = 100
+rc.pprint = True
+rc.separate_in = '\n'
+rc.separate_out = '\n'
+rc.separate_out2 = ''
+rc.prompt_in1 = r'In [\#]: '
+rc.prompt_in2 = r'   .\\D.: '
+rc.prompt_out = ''
+rc.prompts_pad_left = False
+
+##############################################################################
+
+# Top-level utilities
+def default_display_formatters():
+    """ Return a list of default display formatters.
+    """
+
+    from display_formatter import PPrintDisplayFormatter, ReprDisplayFormatter
+    return [PPrintDisplayFormatter(), ReprDisplayFormatter()]
+
+def default_traceback_formatters():
+    """ Return a list of default traceback formatters.
+    """
+
+    from traceback_formatter import PlainTracebackFormatter
+    return [PlainTracebackFormatter()]
+
+# Top-level classes
+class NotDefined(object):    pass
+
+class Interpreter(object):
+    """ An interpreter object.
+
+    fixme: needs to negotiate available formatters with frontends.
+
+    Important: the interpeter should be built so that it exposes a method
+    for each attribute/method of its sub-object. This way it can be
+    replaced by a network adapter.
+    """
+
+    def __init__(self, user_ns=None, global_ns=None,translator=None,
+                 magic=None, display_formatters=None,
+                 traceback_formatters=None, output_trap=None, history=None,
+                 message_cache=None, filename='<string>', config=None):
+
+        # The local/global namespaces for code execution
+        local_ns = user_ns  # compatibility name
+        if local_ns is None:
+            local_ns = {}
+        self.user_ns = local_ns
+        # The local namespace
+        if global_ns is None:
+            global_ns = {}
+        self.user_global_ns = global_ns
+
+        # An object that will translate commands into executable Python.
+        # The current translator does not work properly so for now we are going
+        # without!
+        # if translator is None:
+        #             from IPython.kernel.core.translator import IPythonTranslator
+        #             translator = IPythonTranslator()
+        self.translator = translator
+
+        # An object that maintains magic commands.
+        if magic is None:
+            from IPython.kernel.core.magic import Magic
+            magic = Magic(self)
+        self.magic = magic
+
+        # A list of formatters for the displayhook.
+        if display_formatters is None:
+            display_formatters = default_display_formatters()
+        self.display_formatters = display_formatters
+
+        # A list of formatters for tracebacks.
+        if traceback_formatters is None:
+            traceback_formatters = default_traceback_formatters()
+        self.traceback_formatters = traceback_formatters
+
+        # The object trapping stdout/stderr.
+        if output_trap is None:
+            from IPython.kernel.core.output_trap import OutputTrap
+            output_trap = OutputTrap()
+        self.output_trap = output_trap
+
+        # An object that manages the history.
+        if history is None:
+            from IPython.kernel.core.history import InterpreterHistory
+            history = InterpreterHistory()
+        self.history = history
+        self.get_history_item = history.get_history_item
+        self.get_history_input_cache = history.get_input_cache
+        self.get_history_input_after = history.get_input_after
+
+        # An object that caches all of the return messages.
+        if message_cache is None:
+            from IPython.kernel.core.message_cache import SimpleMessageCache
+            message_cache = SimpleMessageCache()
+        self.message_cache = message_cache
+
+        # The "filename" of the code that is executed in this interpreter.
+        self.filename = filename
+
+        # An object that contains much configuration information.
+        if config is None:
+            # fixme: Move this constant elsewhere!
+            config = Bunch(ESC_MAGIC='%')
+        self.config = config
+
+        # Hook managers.
+        # fixme: make the display callbacks configurable. In the meantime,
+        # enable macros.
+        self.display_trap = DisplayTrap(
+            formatters=self.display_formatters,
+            callbacks=[self._possible_macro],
+        )
+        self.traceback_trap = TracebackTrap(
+            formatters=self.traceback_formatters)
+
+        # This is used temporarily for reformating exceptions in certain
+        # cases.  It will go away once the ultraTB stuff is ported
+        # to ipython1
+        self.tbHandler = ultraTB.FormattedTB(color_scheme='NoColor',
+                                                 mode='Context',
+                                                 tb_offset=2)
+
+        # An object that can compile commands and remember __future__
+        # statements.
+        self.command_compiler = codeop.CommandCompiler()
+
+        # A replacement for the raw_input() and input() builtins. Change these
+        # attributes later to configure them.
+        self.raw_input_builtin = raw_input
+        self.input_builtin = input
+
+        # The number of the current cell.
+        self.current_cell_number = 1
+
+        # Initialize cache, set in/out prompts and printing system
+        self.outputcache = CachedOutput(self,
+                                        rc.cache_size,
+                                        rc.pprint,
+                                        input_sep = rc.separate_in,
+                                        output_sep = rc.separate_out,
+                                        output_sep2 = rc.separate_out2,
+                                        ps1 = rc.prompt_in1,
+                                        ps2 = rc.prompt_in2,
+                                        ps_out = rc.prompt_out,
+                                        pad_left = rc.prompts_pad_left)
+
+        # Need to decide later if this is the right approach, but clients
+        # commonly use sys.ps1/2, so it may be best to just set them here
+        sys.ps1 = self.outputcache.prompt1.p_str
+        sys.ps2 = self.outputcache.prompt2.p_str
+
+        # This is the message dictionary assigned temporarily when running the
+        # code.
+        self.message = None
+
+        self.setup_namespace()
+
+
+    #### Public 'Interpreter' interface ########################################
+
+    def formatTraceback(self, et, ev, tb, message=''):
+        """Put a formatted version of the traceback into value and reraise.
+        
+        When exceptions have to be sent over the network, the traceback 
+        needs to be put into the value of the exception in a nicely
+        formatted way.  The method takes the type, value and tb of an 
+        exception and puts a string representation of the tb into the 
+        value of the exception and reraises it.
+        
+        Currently this method uses the ultraTb formatter from IPython trunk.
+        Eventually it should simply use the traceback formatters in core
+        that are loaded into self.tracback_trap.formatters.
+        """
+        tbinfo = self.tbHandler.text(et,ev,tb)
+        ev._ipython_traceback_text = tbinfo
+        return et, ev, tb
+        
+    def execute(self, commands, raiseException=True):
+        """ Execute some IPython commands.
+
+        1. Translate them into Python.
+        2. Run them.
+        3. Trap stdout/stderr.
+        4. Trap sys.displayhook().
+        5. Trap exceptions.
+        6. Return a message object.
+
+        Parameters
+        ----------
+        commands : str
+            The raw commands that the user typed into the prompt.
+        
+        Returns
+        -------
+        message : dict
+            The dictionary of responses. See the README.txt in this directory
+            for an explanation of the format.
+        """
+
+        # Create a message dictionary with all of the information we will be
+        # returning to the frontend and other listeners.
+        message = self.setup_message()
+
+        # Massage the input and store the raw and translated commands into
+        # a dict.
+        user_input = dict(raw=commands)
+        if self.translator is not None:
+            python = self.translator(commands, message)
+            if python is None:
+                # Something went wrong with the translation. The translator
+                # should have added an appropriate entry to the message object.
+                return message
+        else:
+            python = commands
+        user_input['translated'] = python
+        message['input'] = user_input
+
+        # Set the message object so that any magics executed in the code have
+        # access.
+        self.message = message
+
+        # Set all of the output/exception traps.
+        self.set_traps()
+        
+        # Actually execute the Python code.
+        status = self.execute_python(python)
+
+        # Unset all of the traps.
+        self.unset_traps()
+
+        # Unset the message object.
+        self.message = None
+
+        # Update the history variables in the namespace.
+        # E.g. In, Out, _, __, ___
+        if self.history is not None:
+            self.history.update_history(self, python)
+
+        # Let all of the traps contribute to the message and then clear their
+        # stored information.
+        self.output_trap.add_to_message(message)
+        self.output_trap.clear()
+        self.display_trap.add_to_message(message)
+        self.display_trap.clear()
+        self.traceback_trap.add_to_message(message)
+        # Pull out the type, value and tb of the current exception
+        # before clearing it.
+        einfo = self.traceback_trap.args
+        self.traceback_trap.clear()
+        
+        # Cache the message.
+        self.message_cache.add_message(self.current_cell_number, message)
+
+        # Bump the number.
+        self.current_cell_number += 1
+        
+        # This conditional lets the execute method either raise any
+        # exception that has occured in user code OR return the message
+        # dict containing the traceback and other useful info.
+        if raiseException and einfo:
+            raise einfo[0],einfo[1],einfo[2]
+        else:
+            return message
+
+    def generate_prompt(self, is_continuation):
+        """Calculate and return a string with the prompt to display.
+
+        :Parameters:
+          is_continuation : bool
+            Whether the input line is continuing multiline input or not, so
+          that a proper continuation prompt can be computed."""
+        
+        if is_continuation:
+            return str(self.outputcache.prompt2)
+        else:
+            return str(self.outputcache.prompt1)
+
+    def execute_python(self, python):
+        """ Actually run the Python code in the namespace.
+
+        :Parameters:
+
+        python : str
+            Pure, exec'able Python code. Special IPython commands should have
+            already been translated into pure Python.
+        """
+
+        # We use a CommandCompiler instance to compile the code so as to keep
+        # track of __future__ imports.
+        try:
+            commands = self.split_commands(python)
+        except (SyntaxError, IndentationError), e:
+            # Save the exc_info so compilation related exceptions can be
+            # reraised
+            self.traceback_trap.args = sys.exc_info()
+            self.pack_exception(self.message,e)
+            return None
+
+        for cmd in commands:
+            try:
+                code = self.command_compiler(cmd, self.filename, 'single')
+            except (SyntaxError, OverflowError, ValueError), e:
+                self.traceback_trap.args = sys.exc_info()
+                self.pack_exception(self.message,e)
+                # No point in continuing if one block raised
+                return None
+            else:
+                self.execute_block(code)
+
+    def execute_block(self,code):
+        """Execute a single block of code in the user namespace.
+
+        Return value: a flag indicating whether the code to be run completed
+        successfully:
+
+          - 0: successful execution.
+          - 1: an error occurred.
+          """
+        
+        outflag = 1 # start by assuming error, success will reset it
+        try:
+            exec code in self.user_ns
+            outflag = 0
+        except SystemExit:
+            self.resetbuffer()
+            self.traceback_trap.args = sys.exc_info()
+        except:
+            self.traceback_trap.args = sys.exc_info()
+
+        return outflag
+
+    def execute_macro(self, macro):
+        """ Execute the value of a macro.
+
+        Parameters
+        ----------
+        macro : Macro
+        """
+
+        python = macro.value
+        if self.translator is not None:
+            python = self.translator(python)
+        self.execute_python(python)
+
+    def getCommand(self, i=None):
+        """Gets the ith message in the message_cache.
+        
+        This is implemented here for compatibility with the old ipython1 shell
+        I am not sure we need this though.  I even seem to remember that we
+        were going to get rid of it.
+        """
+        return self.message_cache.get_message(i)
+
+    def reset(self):
+        """Reset the interpreter.
+        
+        Currently this only resets the users variables in the namespace.
+        In the future we might want to also reset the other stateful
+        things like that the Interpreter has, like In, Out, etc.
+        """
+        self.user_ns.clear()
+        self.setup_namespace()
+
+    def complete(self,line,text=None, pos=None):
+        """Complete the given text.
+
+        :Parameters:
+
+          text : str
+            Text fragment to be completed on.  Typically this is
+        """
+        # fixme: implement
+        raise NotImplementedError
+
+    def push(self, ns):
+        """ Put value into the namespace with name key.
+        
+        Parameters
+        ----------
+        **kwds
+        """
+
+        self.user_ns.update(ns)
+
+    def push_function(self, ns):
+        # First set the func_globals for all functions to self.user_ns
+        new_kwds = {}
+        for k, v in ns.iteritems():
+            if not isinstance(v, FunctionType):
+                raise TypeError("function object expected")
+            new_kwds[k] = FunctionType(v.func_code, self.user_ns)
+        self.user_ns.update(new_kwds)        
+
+    def pack_exception(self,message,exc):
+        message['exception'] = exc.__class__
+        message['exception_value'] = \
+            traceback.format_exception_only(exc.__class__, exc)
+
+    def feed_block(self, source, filename='<input>', symbol='single'):
+        """Compile some source in the interpreter.
+
+        One several things can happen:
+
+        1) The input is incorrect; compile_command() raised an
+        exception (SyntaxError or OverflowError).
+
+        2) The input is incomplete, and more input is required;
+        compile_command() returned None.  Nothing happens.
+
+        3) The input is complete; compile_command() returned a code
+        object.  The code is executed by calling self.runcode() (which
+        also handles run-time exceptions, except for SystemExit).
+
+        The return value is:
+
+          - True in case 2
+
+          - False in the other cases, unless an exception is raised, where
+          None is returned instead.  This can be used by external callers to
+          know whether to continue feeding input or not.
+
+        The return value can be used to decide whether to use sys.ps1 or
+        sys.ps2 to prompt the next line."""
+
+        self.message = self.setup_message()
+
+        try:
+            code = self.command_compiler(source,filename,symbol)
+        except (OverflowError, SyntaxError, IndentationError, ValueError ), e:
+            # Case 1
+            self.traceback_trap.args = sys.exc_info()
+            self.pack_exception(self.message,e)
+            return COMPILER_ERROR,False
+
+        if code is None:
+            # Case 2: incomplete input.  This means that the input can span
+            # multiple lines.  But we still need to decide when to actually
+            # stop taking user input.  Later we'll add auto-indentation support
+            # somehow.  In the meantime, we'll just stop if there are two lines
+            # of pure whitespace at the end.
+            last_two = source.rsplit('\n',2)[-2:]
+            print 'last two:',last_two  # dbg
+            if len(last_two)==2 and all(s.isspace() for s in last_two):
+                return COMPLETE_INPUT,False
+            else:
+                return INCOMPLETE_INPUT, True
+        else:
+            # Case 3
+            return COMPLETE_INPUT, False
+        
+    def pull(self, keys):
+        """ Get an item out of the namespace by key.
+        
+        Parameters
+        ----------
+        key : str
+
+        Returns
+        -------
+        value : object
+
+        Raises
+        ------
+        TypeError if the key is not a string.
+        NameError if the object doesn't exist.
+        """
+
+        if isinstance(keys, str):
+            result = self.user_ns.get(keys, NotDefined())
+            if isinstance(result, NotDefined):
+                raise NameError('name %s is not defined' % keys)        
+        elif isinstance(keys, (list, tuple)):
+            result = []
+            for key in keys:
+                if not isinstance(key, str):
+                    raise TypeError("objects must be keyed by strings.")
+                else:
+                    r = self.user_ns.get(key, NotDefined())
+                    if isinstance(r, NotDefined):
+                        raise NameError('name %s is not defined' % key)
+                    else:
+                        result.append(r)
+                    if len(keys)==1:
+                        result = result[0]
+        else:
+            raise TypeError("keys must be a strong or a list/tuple of strings")
+        return result
+
+    def pull_function(self, keys):
+        return self.pull(keys)
+
+    #### Interactive user API ##################################################
+
+    def ipsystem(self, command):
+        """ Execute a command in a system shell while expanding variables in the
+        current namespace.
+
+        Parameters
+        ----------
+        command : str
+        """
+
+        # Expand $variables.
+        command = self.var_expand(command)
+
+        system_shell(command,
+            header='IPython system call: ',
+            verbose=self.rc.system_verbose,
+        )
+
+    def ipmagic(self, arg_string):
+        """ Call a magic function by name.
+
+        ipmagic('name -opt foo bar') is equivalent to typing at the ipython
+        prompt:
+
+        In[1]: %name -opt foo bar
+
+        To call a magic without arguments, simply use ipmagic('name').
+
+        This provides a proper Python function to call IPython's magics in any
+        valid Python code you can type at the interpreter, including loops and
+        compound statements.  It is added by IPython to the Python builtin
+        namespace upon initialization.
+
+        Parameters
+        ----------
+        arg_string : str
+            A string containing the name of the magic function to call and any
+            additional arguments to be passed to the magic.
+
+        Returns
+        -------
+        something : object
+            The return value of the actual object.
+        """
+
+        # Taken from IPython.
+        raise NotImplementedError('Not ported yet')
+
+        args = arg_string.split(' ', 1)
+        magic_name = args[0]
+        magic_name = magic_name.lstrip(self.config.ESC_MAGIC)
+
+        try:
+            magic_args = args[1]
+        except IndexError:
+            magic_args = ''
+        fn = getattr(self.magic, 'magic_'+magic_name, None)
+        if fn is None:
+            self.error("Magic function `%s` not found." % magic_name)
+        else:
+            magic_args = self.var_expand(magic_args)
+            return fn(magic_args)
+
+
+    #### Private 'Interpreter' interface #######################################
+
+    def setup_message(self):
+        """Return a message object.
+
+        This method prepares and returns a message dictionary.  This dict
+        contains the various fields that are used to transfer information about
+        execution, results, tracebacks, etc, to clients (either in or out of
+        process ones).  Because of the need to work with possibly out of
+        process clients, this dict MUST contain strictly pickle-safe values.
+        """
+
+        return dict(number=self.current_cell_number)
+    
+    def setup_namespace(self):
+        """ Add things to the namespace.
+        """
+
+        self.user_ns.setdefault('__name__', '__main__')
+        self.user_ns.setdefault('__builtins__', __builtin__)
+        self.user_ns['__IP'] = self
+        if self.raw_input_builtin is not None:
+            self.user_ns['raw_input'] = self.raw_input_builtin
+        if self.input_builtin is not None:
+            self.user_ns['input'] = self.input_builtin
+
+        builtin_additions = dict(
+            ipmagic=self.ipmagic,
+        )
+        __builtin__.__dict__.update(builtin_additions)
+
+        if self.history is not None:
+            self.history.setup_namespace(self.user_ns)
+
+    def set_traps(self):
+        """ Set all of the output, display, and traceback traps.
+        """
+
+        self.output_trap.set()
+        self.display_trap.set()
+        self.traceback_trap.set()
+
+    def unset_traps(self):
+        """ Unset all of the output, display, and traceback traps.
+        """
+
+        self.output_trap.unset()
+        self.display_trap.unset()
+        self.traceback_trap.unset()
+
+    def split_commands(self, python):
+        """ Split multiple lines of code into discrete commands that can be
+        executed singly.
+
+        Parameters
+        ----------
+        python : str
+            Pure, exec'able Python code.
+
+        Returns
+        -------
+        commands : list of str
+            Separate commands that can be exec'ed independently.
+        """
+
+        # compiler.parse treats trailing spaces after a newline as a
+        # SyntaxError.  This is different than codeop.CommandCompiler, which
+        # will compile the trailng spaces just fine.  We simply strip any
+        # trailing whitespace off.  Passing a string with trailing whitespace
+        # to exec will fail however.  There seems to be some inconsistency in
+        # how trailing whitespace is handled, but this seems to work.
+        python = python.strip()
+
+        # The compiler module will parse the code into an abstract syntax tree.
+        ast = compiler.parse(python)
+
+        # Uncomment to help debug the ast tree
+        # for n in ast.node:
+        #     print n.lineno,'->',n
+                
+        # Each separate command is available by iterating over ast.node. The
+        # lineno attribute is the line number (1-indexed) beginning the commands
+        # suite.
+        # lines ending with ";" yield a Discard Node that doesn't have a lineno
+        # attribute.  These nodes can and should be discarded.  But there are
+        # other situations that cause Discard nodes that shouldn't be discarded.
+        # We might eventually discover other cases where lineno is None and have
+        # to put in a more sophisticated test.
+        linenos = [x.lineno-1 for x in ast.node if x.lineno is not None]
+
+        # When we finally get the slices, we will need to slice all the way to
+        # the end even though we don't have a line number for it. Fortunately,
+        # None does the job nicely.
+        linenos.append(None)
+        lines = python.splitlines()
+
+        # Create a list of atomic commands.
+        cmds = []
+        for i, j in zip(linenos[:-1], linenos[1:]):
+            cmd = lines[i:j]
+            if cmd:
+                cmds.append('\n'.join(cmd)+'\n')
+
+        return cmds
+
+    def error(self, text):
+        """ Pass an error message back to the shell.
+
+        Preconditions
+        -------------
+        This should only be called when self.message is set. In other words,
+        when code is being executed.
+
+        Parameters
+        ----------
+        text : str
+        """
+
+        errors = self.message.get('IPYTHON_ERROR', [])
+        errors.append(text)
+
+    def var_expand(self, template):
+        """ Expand $variables in the current namespace using Itpl.
+
+        Parameters
+        ----------
+        template : str
+        """
+
+        return str(ItplNS(template, self.user_ns))
+
+    def _possible_macro(self, obj):
+        """ If the object is a macro, execute it.
+        """
+
+        if isinstance(obj, Macro):
+            self.execute_macro(obj)
+
diff --git a/IPython/kernel/core/macro.py b/IPython/kernel/core/macro.py
new file mode 100644
index 0000000..56d2b44
--- /dev/null
+++ b/IPython/kernel/core/macro.py
@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+"""Support for interactive macros in IPython"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+class Macro:
+    """Simple class to store the value of macros as strings.
+
+    This allows us to later exec them by checking when something is an
+    instance of this class."""
+
+    def __init__(self,data):
+
+        # store the macro value, as a single string which can be evaluated by
+        # runlines()
+        self.value = ''.join(data).rstrip()+'\n'
+
+    def __str__(self):
+        return self.value
+
+    def __repr__(self):
+        return 'IPython.macro.Macro(%s)' % repr(self.value)
\ No newline at end of file
diff --git a/IPython/kernel/core/magic.py b/IPython/kernel/core/magic.py
new file mode 100644
index 0000000..967ce73
--- /dev/null
+++ b/IPython/kernel/core/magic.py
@@ -0,0 +1,147 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+import __builtin__
+
+# Local imports.
+from util import Bunch
+
+
+# fixme: RTK thinks magics should be implemented as separate classes rather than
+# methods on a single class. This would give us the ability to plug new magics
+# in and configure them separately.
+
+class Magic(object):
+    """ An object that maintains magic functions.
+    """
+
+    def __init__(self, interpreter, config=None):
+        # A reference to the interpreter.
+        self.interpreter = interpreter
+
+        # A reference to the configuration object.
+        if config is None:
+            # fixme: we need a better place to store this information.
+            config = Bunch(ESC_MAGIC='%')
+        self.config = config
+
+    def has_magic(self, name):
+        """ Return True if this object provides a given magic.
+
+        Parameters
+        ----------
+        name : str
+        """
+
+        return hasattr(self, 'magic_' + name)
+
+    def object_find(self, name):
+        """ Find an object in the available namespaces.
+
+        fixme: this should probably be moved elsewhere. The interpreter?
+        """
+
+        name = name.strip()
+
+        # Namespaces to search.
+        # fixme: implement internal and alias namespaces.
+        user_ns = self.interpreter.user_ns
+        internal_ns = {}
+        builtin_ns = __builtin__.__dict__
+        alias_ns = {}
+
+        # Order the namespaces.
+        namespaces = [
+            ('Interactive', user_ns),
+            ('IPython internal', internal_ns),
+            ('Python builtin', builtin_ns),
+            ('Alias', alias_ns),
+        ]
+
+        # Initialize all results.
+        found = False
+        obj = None
+        space = None
+        ds = None
+        ismagic = False
+        isalias = False
+
+        # Look for the given name by splitting it in parts.  If the head is
+        # found, then we look for all the remaining parts as members, and only
+        # declare success if we can find them all.
+        parts = name.split('.')
+        head, rest = parts[0], parts[1:]
+        for nsname, ns in namespaces:
+            try:
+                obj = ns[head]
+            except KeyError:
+                continue
+            else:
+                for part in rest:
+                    try:
+                        obj = getattr(obj, part)
+                    except:
+                        # Blanket except b/c some badly implemented objects
+                        # allow __getattr__ to raise exceptions other than
+                        # AttributeError, which then crashes us.
+                        break
+                else:
+                    # If we finish the for loop (no break), we got all members
+                    found = True
+                    space = nsname
+                    isalias = (ns == alias_ns)
+                    break  # namespace loop
+
+        # Try to see if it is a magic.
+        if not found:
+            if name.startswith(self.config.ESC_MAGIC):
+                name = name[1:]
+            obj = getattr(self, 'magic_' + name, None)
+            if obj is not None:
+                found = True
+                space = 'IPython internal'
+                ismagic = True
+
+        # Last try: special-case some literals like '', [], {}, etc:
+        if not found and head in ["''", '""', '[]', '{}', '()']:
+            obj = eval(head)
+            found = True
+            space = 'Interactive'
+
+        return dict(
+            found=found,
+            obj=obj,
+            namespace=space,
+            ismagic=ismagic,
+            isalias=isalias,
+        )
+            
+                    
+
+
+
+    def magic_pwd(self, parameter_s=''):
+        """ Return the current working directory path.
+        """
+        return os.getcwd()
+
+    def magic_env(self, parameter_s=''):
+        """ List environment variables.
+        """
+        
+        return os.environ.data
+
+
diff --git a/IPython/kernel/core/message_cache.py b/IPython/kernel/core/message_cache.py
new file mode 100644
index 0000000..f0385f5
--- /dev/null
+++ b/IPython/kernel/core/message_cache.py
@@ -0,0 +1,98 @@
+# encoding: utf-8
+
+"""Storage for the responses from the interpreter."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+
+class IMessageCache(object):
+    """ Storage for the response from the interpreter.
+    """
+
+    def add_message(self, i, message):
+        """ Add a message dictionary to the cache.
+
+        Parameters
+        ----------
+        i : int
+        message : dict
+        """
+
+    def get_message(self, i=None):
+        """ Get the message from the cache.
+
+        Parameters
+        ----------
+        i : int, optional
+            The number of the message. If not provided, return the
+            highest-numbered message.
+
+        Returns
+        -------
+        message : dict
+
+        Raises
+        ------
+        IndexError if the message does not exist in the cache.
+        """
+
+
+class SimpleMessageCache(object):
+    """ Simple dictionary-based, in-memory storage of the responses from the
+    interpreter.
+    """
+
+    def __init__(self):
+        self.cache = {}
+
+    def add_message(self, i, message):
+        """ Add a message dictionary to the cache.
+
+        Parameters
+        ----------
+        i : int
+        message : dict
+        """
+
+        self.cache[i] = message
+
+    def get_message(self, i=None):
+        """ Get the message from the cache.
+
+        Parameters
+        ----------
+        i : int, optional
+            The number of the message. If not provided, return the
+            highest-numbered message.
+
+        Returns
+        -------
+        message : dict
+
+        Raises
+        ------
+        IndexError if the message does not exist in the cache.
+        """
+        if i is None:
+            keys = self.cache.keys()
+            if len(keys) == 0:
+                raise IndexError("index %r out of range" % i)
+            else:
+                i = max(self.cache.keys())
+        try:
+            return self.cache[i]
+        except KeyError:
+            # IndexError is more appropriate, here.
+            raise IndexError("index %r out of range" % i)
+
diff --git a/IPython/kernel/core/output_trap.py b/IPython/kernel/core/output_trap.py
new file mode 100644
index 0000000..8e65662
--- /dev/null
+++ b/IPython/kernel/core/output_trap.py
@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+""" Trap stdout/stderr."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import sys
+from cStringIO import StringIO
+
+
+class OutputTrap(object):
+    """ Object which can trap text sent to stdout and stderr.
+    """
+
+    def __init__(self):
+        # Filelike objects to store stdout/stderr text.
+        self.out = StringIO()
+        self.err = StringIO()
+
+        # Boolean to check if the stdout/stderr hook is set.
+        self.out_set = False
+        self.err_set = False
+
+    @property
+    def out_text(self):
+        """ Return the text currently in the stdout buffer.
+        """
+        return self.out.getvalue()
+
+    @property
+    def err_text(self):
+        """ Return the text currently in the stderr buffer.
+        """
+        return self.err.getvalue()
+
+    def set(self):
+        """ Set the hooks.
+        """
+
+        if sys.stdout is not self.out:
+            self._out_save = sys.stdout
+            sys.stdout = self.out
+            self.out_set = True
+
+        if sys.stderr is not self.err:
+            self._err_save = sys.stderr
+            sys.stderr = self.err
+            self.err_set = True
+
+    def unset(self):
+        """ Remove the hooks.
+        """
+
+        sys.stdout = self._out_save
+        self.out_set = False
+
+        sys.stderr = self._err_save
+        self.err_set = False
+
+    def clear(self):
+        """ Clear out the buffers.
+        """
+
+        self.out.close()
+        self.out = StringIO()
+
+        self.err.close()
+        self.err = StringIO()
+
+    def add_to_message(self, message):
+        """ Add the text from stdout and stderr to the message from the
+        interpreter to its listeners.
+
+        Parameters
+        ----------
+        message : dict
+        """
+
+        out_text = self.out_text
+        if out_text:
+            message['stdout'] = out_text
+
+        err_text = self.err_text
+        if err_text:
+            message['stderr'] = err_text
+
+
+
diff --git a/IPython/kernel/core/prompts.py b/IPython/kernel/core/prompts.py
new file mode 100644
index 0000000..4c572dc
--- /dev/null
+++ b/IPython/kernel/core/prompts.py
@@ -0,0 +1,591 @@
+# encoding: utf-8
+
+"""Classes for handling input/output prompts."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython import Release
+__author__  = '%s <%s>' % Release.authors['Fernando']
+__license__ = Release.license
+__version__ = Release.version
+
+#****************************************************************************
+# Required modules
+import __builtin__
+import os
+import socket
+import sys
+import time
+
+# IPython's own
+from IPython.external.Itpl import ItplNS
+from macro import Macro
+
+# Temporarily use this until it is ported to ipython1
+
+from IPython import ColorANSI
+from IPython.ipstruct import Struct
+from IPython.genutils import *
+from IPython.ipapi import TryNext
+
+#****************************************************************************
+#Color schemes for Prompts.
+
+PromptColors = ColorANSI.ColorSchemeTable()
+InputColors = ColorANSI.InputTermColors  # just a shorthand
+Colors = ColorANSI.TermColors  # just a shorthand
+
+
+__PColNoColor = 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)
+    )
+
+PromptColors.add_scheme(__PColNoColor)
+
+# make some schemes as instances so we can copy them for modification easily:
+__PColLinux  = __PColNoColor.copy('Linux')
+# Don't forget to enter it into the table!
+PromptColors.add_scheme(__PColLinux)
+__PColLightBG  = __PColLinux.copy('LightBG')
+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))}',
+    # 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': __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()
+        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)
+
+    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."""
+
+        cwd = os.getcwd().replace(HOME,"~").split(os.sep)
+        if '~' in cwd and len(cwd) == depth+1:
+            depth += 1
+        out = os.sep.join(cwd[-depth:])
+        if out:
+            return out
+        else:
+            return os.sep
+
+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.history.input_cache
+
+        # 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 ';'
+            if self.input_hist[self.prompt_count].endswith(';\n'):
+                return
+            # 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)
+
+            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.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?
+
diff --git a/IPython/kernel/core/shell.py b/IPython/kernel/core/shell.py
new file mode 100644
index 0000000..eb266ae
--- /dev/null
+++ b/IPython/kernel/core/shell.py
@@ -0,0 +1,357 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.test.test_shell -*-
+
+"""The core IPython Shell"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import pprint
+import signal
+import sys
+import threading
+import time
+
+from code import InteractiveConsole, softspace
+from StringIO import StringIO
+
+from IPython.OutputTrap import OutputTrap
+from IPython import ultraTB
+
+from IPython.kernel.error import NotDefined
+
+
+class InteractiveShell(InteractiveConsole):
+    """The Basic IPython Shell class.  
+    
+    This class provides the basic capabilities of IPython.  Currently
+    this class does not do anything IPython specific.  That is, it is
+    just a python shell.
+    
+    It is modelled on code.InteractiveConsole, but adds additional
+    capabilities.  These additional capabilities are what give IPython
+    its power.  
+    
+    The current version of this class is meant to be a prototype that guides
+    the future design of the IPython core.  This class must not use Twisted
+    in any way, but it must be designed in a way that makes it easy to 
+    incorporate into Twisted and hook network protocols up to.  
+    
+    Some of the methods of this class comprise the official IPython core
+    interface.  These methods must be tread safe and they must return types
+    that can be easily serialized by protocols such as PB, XML-RPC and SOAP.
+    Locks have been provided for making the methods thread safe, but additional
+    locks can be added as needed.
+      
+    Any method that is meant to be a part of the official interface must also
+    be declared in the kernel.coreservice.ICoreService interface.  Eventually
+    all other methods should have single leading underscores to note that they
+    are not designed to be 'public.'  Currently, because this class inherits
+    from code.InteractiveConsole there are many private methods w/o leading
+    underscores.  The interface should be as simple as possible and methods 
+    should not be added to the interface unless they really need to be there.   
+    
+    Note:
+    
+    - For now I am using methods named put/get to move objects in/out of the
+      users namespace.  Originally, I was calling these methods push/pull, but
+      because code.InteractiveConsole already has a push method, I had to use
+      something different.  Eventually, we probably won't subclass this class
+      so we can call these methods whatever we want.  So, what do we want to
+      call them?
+    - We need a way of running the trapping of stdout/stderr in different ways.
+      We should be able to i) trap, ii) not trap at all or iii) trap and echo
+      things to stdout and stderr.
+    - How should errors be handled?  Should exceptions be raised?
+    - What should methods that don't compute anything return?  The default of 
+      None?
+    """
+     
+    def __init__(self, locals=None, filename="<console>"):
+        """Creates a new TrappingInteractiveConsole object."""
+        InteractiveConsole.__init__(self,locals,filename)
+        self._trap = OutputTrap(debug=0)
+        self._stdin = []
+        self._stdout = []
+        self._stderr = []
+        self._last_type = self._last_traceback = self._last_value = None
+        #self._namespace_lock = threading.Lock()
+        #self._command_lock = threading.Lock()
+        self.lastCommandIndex = -1
+        # I am using this user defined signal to interrupt the currently 
+        # running command.  I am not sure if this is the best way, but
+        # it is working!
+        # This doesn't work on Windows as it doesn't have this signal.
+        #signal.signal(signal.SIGUSR1, self._handleSIGUSR1)
+
+        # An exception handler.  Experimental: later we need to make the
+        # modes/colors available to user configuration, etc.
+        self.tbHandler = ultraTB.FormattedTB(color_scheme='NoColor',
+                                             mode='Context',
+                                             tb_offset=2)
+
+    def _handleSIGUSR1(self, signum, frame):
+        """Handle the SIGUSR1 signal by printing to stderr."""
+        print>>sys.stderr, "Command stopped."
+        
+    def _prefilter(self, line, more):
+        return line
+
+    def _trapRunlines(self, lines):
+        """
+        This executes the python source code, source, in the
+        self.locals namespace and traps stdout and stderr.  Upon
+        exiting, self.out and self.err contain the values of 
+        stdout and stderr for the last executed command only.
+        """
+        
+        # Execute the code
+        #self._namespace_lock.acquire()
+        self._trap.flush()
+        self._trap.trap()
+        self._runlines(lines)
+        self.lastCommandIndex += 1
+        self._trap.release()
+        #self._namespace_lock.release()
+                
+        # Save stdin, stdout and stderr to lists
+        #self._command_lock.acquire()
+        self._stdin.append(lines)
+        self._stdout.append(self.prune_output(self._trap.out.getvalue()))
+        self._stderr.append(self.prune_output(self._trap.err.getvalue()))
+        #self._command_lock.release()
+
+    def prune_output(self, s):
+        """Only return the first and last 1600 chars of stdout and stderr.
+        
+        Something like this is required to make sure that the engine and
+        controller don't become overwhelmed by the size of stdout/stderr.
+        """
+        if len(s) > 3200:
+            return s[:1600] + '\n............\n' + s[-1600:]
+        else: 
+            return s
+
+    # Lifted from iplib.InteractiveShell
+    def _runlines(self,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).
+        self.resetbuffer()
+        lines = lines.split('\n')
+        more = 0
+        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 line or more:
+                more = self.push((self._prefilter(line,more)))
+                # 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:
+            self.push('\n')
+
+    def runcode(self, code):
+        """Execute a code object.
+
+        When an exception occurs, self.showtraceback() is called to
+        display a traceback.  All exceptions are caught except
+        SystemExit, which is reraised.
+
+        A note about KeyboardInterrupt: this exception may occur
+        elsewhere in this code, and may not always be caught.  The
+        caller should be prepared to deal with it.
+
+        """
+
+        self._last_type = self._last_traceback = self._last_value = None
+        try:
+            exec code in self.locals
+        except:
+            # Since the exception info may need to travel across the wire, we
+            # pack it in right away.  Note that we are abusing the exception
+            # value to store a fully formatted traceback, since the stack can
+            # not be serialized for network transmission.
+            et,ev,tb = sys.exc_info()
+            self._last_type = et
+            self._last_traceback = tb
+            tbinfo = self.tbHandler.text(et,ev,tb)
+            # Construct a meaningful traceback message for shipping over the
+            # wire.
+            buf = pprint.pformat(self.buffer)
+            try:
+                ename = et.__name__
+            except:
+                ename = et
+            msg = """\
+%(ev)s            
+***************************************************************************
+An exception occurred in an IPython engine while executing user code.
+
+Current execution buffer (lines being run):
+%(buf)s
+
+A full traceback from the actual engine:
+%(tbinfo)s
+***************************************************************************
+            """ % locals()
+            self._last_value = msg
+        else:
+            if softspace(sys.stdout, 0):
+                print
+
+    ##################################################################
+    # Methods that are a part of the official interface
+    #
+    # These methods should also be put in the 
+    # kernel.coreservice.ICoreService interface.
+    #
+    # These methods must conform to certain restrictions that allow
+    # them to be exposed to various network protocols:
+    #
+    # - As much as possible, these methods must return types that can be 
+    #   serialized by PB, XML-RPC and SOAP.  None is OK.
+    # - Every method must be thread safe.  There are some locks provided
+    #   for this purpose, but new, specialized locks can be added to the
+    #   class.
+    ##################################################################
+    
+    # Methods for running code
+
+    def exc_info(self):
+        """Return exception information much like sys.exc_info().
+
+        This method returns the same (etype,evalue,tb) tuple as sys.exc_info,
+        but from the last time that the engine had an exception fire."""
+
+        return self._last_type,self._last_value,self._last_traceback
+    
+    def execute(self, lines):
+        self._trapRunlines(lines)
+        if self._last_type is None:
+            return self.getCommand()
+        else:
+            raise self._last_type(self._last_value)
+        
+    # Methods for working with the namespace
+
+    def put(self, key, value):
+        """Put value into locals namespace with name key.
+        
+        I have often called this push(), but in this case the
+        InteractiveConsole class already defines a push() method that
+        is different.
+        """          
+                  
+        if not isinstance(key, str):
+            raise TypeError, "Objects must be keyed by strings."
+        self.update({key:value})
+
+    def get(self, key):
+        """Gets an item out of the self.locals dict by key.
+        
+        Raise NameError if the object doesn't exist.
+        
+        I have often called this pull().  I still like that better.
+        """
+        
+        class NotDefined(object):
+            """A class to signify an objects that is not in the users ns."""
+            pass
+        
+        if not isinstance(key, str):
+            raise TypeError, "Objects must be keyed by strings."
+        result = self.locals.get(key, NotDefined())
+        if isinstance(result, NotDefined):
+            raise NameError('name %s is not defined' % key)
+        else:
+            return result
+
+
+    def update(self, dictOfData):
+        """Loads a dict of key value pairs into the self.locals namespace."""
+        if not isinstance(dictOfData, dict):
+            raise TypeError, "update() takes a dict object."
+        #self._namespace_lock.acquire()
+        self.locals.update(dictOfData)
+        #self._namespace_lock.release()
+        
+    # Methods for getting stdout/stderr/stdin
+           
+    def reset(self):
+        """Reset the InteractiveShell."""
+        
+        #self._command_lock.acquire()        
+        self._stdin = []
+        self._stdout = []
+        self._stderr = []
+        self.lastCommandIndex = -1
+        #self._command_lock.release()
+
+        #self._namespace_lock.acquire()
+        # preserve id, mpi objects
+        mpi = self.locals.get('mpi', None)
+        id = self.locals.get('id', None)
+        del self.locals
+        self.locals = {'mpi': mpi, 'id': id}
+        #self._namespace_lock.release()
+                
+    def getCommand(self,i=None):
+        """Get the stdin/stdout/stderr of command i."""
+        
+        #self._command_lock.acquire()
+        
+        
+        if i is not None and not isinstance(i, int):
+            raise TypeError("Command index not an int: " + str(i))
+            
+        if i in range(self.lastCommandIndex + 1):
+            inResult = self._stdin[i]
+            outResult = self._stdout[i]
+            errResult = self._stderr[i]
+            cmdNum = i
+        elif i is None and self.lastCommandIndex >= 0:
+            inResult = self._stdin[self.lastCommandIndex]
+            outResult = self._stdout[self.lastCommandIndex]
+            errResult = self._stderr[self.lastCommandIndex]
+            cmdNum = self.lastCommandIndex
+        else:
+            inResult = None
+            outResult = None
+            errResult = None
+        
+        #self._command_lock.release()
+        
+        if inResult is not None:
+            return dict(commandIndex=cmdNum, stdin=inResult, stdout=outResult, stderr=errResult)
+        else:
+            raise IndexError("Command with index %s does not exist" % str(i))
+            
+    def getLastCommandIndex(self):
+        """Get the index of the last command."""
+        #self._command_lock.acquire()
+        ind = self.lastCommandIndex
+        #self._command_lock.release()
+        return ind
+
diff --git a/IPython/kernel/core/tests/__init__.py b/IPython/kernel/core/tests/__init__.py
new file mode 100644
index 0000000..9a4495f
--- /dev/null
+++ b/IPython/kernel/core/tests/__init__.py
@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/kernel/core/tests/test_shell.py b/IPython/kernel/core/tests/test_shell.py
new file mode 100644
index 0000000..87d7ee2
--- /dev/null
+++ b/IPython/kernel/core/tests/test_shell.py
@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+"""This file contains unittests for the shell.py module."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import unittest
+from IPython.kernel.core import shell
+
+resultKeys = ('commandIndex', 'stdin', 'stdout', 'stderr')
+
+class BasicShellTest(unittest.TestCase):
+
+    def setUp(self):
+        self.s = shell.InteractiveShell()
+        
+    def testExecute(self):
+        commands = [(0,"a = 5","",""),
+            (1,"b = 10","",""),
+            (2,"c = a + b","",""),
+            (3,"print c","15\n",""),
+            (4,"import math","",""),
+            (5,"2.0*math.pi","6.2831853071795862\n","")]
+        for c in commands:
+            result = self.s.execute(c[1])
+            self.assertEquals(result, dict(zip(resultKeys,c)))
+            
+    def testPutGet(self):
+        objs = [10,"hi there",1.2342354,{"p":(1,2)}]
+        for o in objs:
+            self.s.put("key",o)
+            value = self.s.get("key")
+            self.assertEquals(value,o)
+        self.assertRaises(TypeError, self.s.put,10)
+        self.assertRaises(TypeError, self.s.get,10)
+        self.s.reset()
+        self.assertRaises(NameError, self.s.get, 'a')
+        
+    def testUpdate(self):
+        d = {"a": 10, "b": 34.3434, "c": "hi there"}
+        self.s.update(d)
+        for k in d.keys():
+            value = self.s.get(k)
+            self.assertEquals(value, d[k])
+        self.assertRaises(TypeError, self.s.update, [1,2,2])
+        
+    def testCommand(self):
+        self.assertRaises(IndexError,self.s.getCommand)
+        self.s.execute("a = 5")
+        self.assertEquals(self.s.getCommand(), dict(zip(resultKeys, (0,"a = 5","",""))))
+        self.assertEquals(self.s.getCommand(0), dict(zip(resultKeys, (0,"a = 5","",""))))
+        self.s.reset()
+        self.assertEquals(self.s.getLastCommandIndex(),-1)
+        self.assertRaises(IndexError,self.s.getCommand)
+        
+        
\ No newline at end of file
diff --git a/IPython/kernel/core/traceback_formatter.py b/IPython/kernel/core/traceback_formatter.py
new file mode 100644
index 0000000..05628e7
--- /dev/null
+++ b/IPython/kernel/core/traceback_formatter.py
@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+"""Some formatter objects to extract traceback information by replacing
+sys.excepthook()."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import traceback
+
+
+class ITracebackFormatter(object):
+    """ Objects conforming to this interface will format tracebacks into other
+    objects.
+    """
+
+    # The kind of formatter.
+    kind = 'traceback'
+
+    # The unique identifier for this formatter.
+    identifier = None
+
+
+    def __call__(self, exc_type, exc_value, exc_traceback):
+        """ Return a formatted representation of a traceback.
+        """
+
+        raise NotImplementedError
+
+
+class PlainTracebackFormatter(ITracebackFormatter):
+    """ Return a string with the regular traceback information.
+    """
+
+    # The unique identifier for this formatter.
+    identifier = 'plain'
+
+
+    def __init__(self, limit=None):
+        # The maximum number of stack levels to go back.
+        # None implies all stack levels are returned.
+        self.limit = limit
+    
+    def __call__(self, exc_type, exc_value, exc_traceback):
+        """ Return a string with the regular traceback information.
+        """
+
+        lines = traceback.format_tb(exc_traceback, self.limit)
+        lines.append('%s: %s' % (exc_type.__name__, exc_value))
+        return '\n'.join(lines)
+
+
diff --git a/IPython/kernel/core/traceback_trap.py b/IPython/kernel/core/traceback_trap.py
new file mode 100644
index 0000000..7fd1d17
--- /dev/null
+++ b/IPython/kernel/core/traceback_trap.py
@@ -0,0 +1,83 @@
+# encoding: utf-8
+
+"""Object to manage sys.excepthook()."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import sys
+
+
+class TracebackTrap(object):
+    """ Object to trap and format tracebacks.
+    """
+
+    def __init__(self, formatters=None):
+        # A list of formatters to apply.
+        if formatters is None:
+            formatters = []
+        self.formatters = formatters
+
+        # All of the traceback information provided to sys.excepthook().
+        self.args = None
+
+        # The previous hook before we replace it.
+        self.old_hook = None
+
+
+    def hook(self, *args):
+        """ This method actually implements the hook.
+        """
+
+        self.args = args
+
+    def set(self):
+        """ Set the hook.
+        """
+
+        if sys.excepthook is not self.hook:
+            self.old_hook = sys.excepthook
+            sys.excepthook = self.hook
+
+    def unset(self):
+        """ Unset the hook.
+        """
+
+        sys.excepthook = self.old_hook
+
+    def clear(self):
+        """ Remove the stored traceback.
+        """
+
+        self.args = None
+
+    def add_to_message(self, message):
+        """ Add the formatted display of the traceback to the message dictionary
+        being returned from the interpreter to its listeners.
+
+        Parameters
+        ----------
+        message : dict
+        """
+
+        # If there was no traceback, then don't add anything.
+        if self.args is None:
+            return
+
+        # Go through the list of formatters and let them add their formatting.
+        traceback = {}
+        for formatter in self.formatters:
+            traceback[formatter.identifier] = formatter(*self.args)
+        
+        message['traceback'] = traceback
+
diff --git a/IPython/kernel/core/ultraTB.py b/IPython/kernel/core/ultraTB.py
new file mode 100644
index 0000000..123d6ae
--- /dev/null
+++ b/IPython/kernel/core/ultraTB.py
@@ -0,0 +1,1018 @@
+# encoding: utf-8
+
+"""
+ultraTB.py -- Spice up your tracebacks!
+
+* ColorTB
+I've always found it a bit hard to visually parse tracebacks in Python.  The
+ColorTB class is a solution to that problem.  It colors the different parts of a
+traceback in a manner similar to what you would expect from a syntax-highlighting
+text editor.
+
+Installation instructions for ColorTB:
+    import sys,ultraTB
+    sys.excepthook = ultraTB.ColorTB()
+
+* VerboseTB  
+I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds
+of useful info when a traceback occurs.  Ping originally had it spit out HTML
+and intended it for CGI programmers, but why should they have all the fun?  I
+altered it to spit out colored text to the terminal.  It's a bit overwhelming,
+but kind of neat, and maybe useful for long-running programs that you believe
+are bug-free.  If a crash *does* occur in that type of program you want details.
+Give it a shot--you'll love it or you'll hate it.
+
+Note:
+
+  The Verbose mode prints the variables currently visible where the exception
+  happened (shortening their strings if too long). This can potentially be
+  very slow, if you happen to have a huge data structure whose string
+  representation is complex to compute. Your computer may appear to freeze for
+  a while with cpu usage at 100%. If this occurs, you can cancel the traceback
+  with Ctrl-C (maybe hitting it more than once).
+
+  If you encounter this kind of situation often, you may want to use the
+  Verbose_novars mode instead of the regular Verbose, which avoids formatting
+  variables (but otherwise includes the information and context given by
+  Verbose).
+  
+
+Installation instructions for ColorTB:
+    import sys,ultraTB
+    sys.excepthook = ultraTB.VerboseTB()
+
+Note:  Much of the code in this module was lifted verbatim from the standard
+library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'.
+
+* Color schemes
+The colors are defined in the class TBTools through the use of the
+ColorSchemeTable class. Currently the following exist:
+
+  - NoColor: allows all of this module to be used in any terminal (the color
+  escapes are just dummy blank strings).
+
+  - Linux: is meant to look good in a terminal like the Linux console (black
+  or very dark background).
+
+  - LightBG: similar to Linux but swaps dark/light colors to be more readable
+  in light background terminals.
+
+You can implement other color schemes easily, the syntax is fairly
+self-explanatory. Please send back new schemes you develop to the author for
+possible inclusion in future releases.
+
+$Id: ultraTB.py 2480 2007-07-06 19:33:43Z fperez $"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython import Release
+__author__  = '%s <%s>\n%s <%s>' % (Release.authors['Nathan']+
+                                    Release.authors['Fernando'])
+__license__ = Release.license
+
+# Required modules
+import inspect
+import keyword
+import linecache
+import os
+import pydoc
+import re
+import string
+import sys
+import time
+import tokenize
+import traceback
+import types
+
+# For purposes of monkeypatching inspect to fix a bug in it.
+from inspect import getsourcefile, getfile, getmodule,\
+     ismodule,  isclass, ismethod, isfunction, istraceback, isframe, iscode
+
+
+# IPython's own modules
+# Modified pdb which doesn't damage IPython's readline handling
+from IPython import Debugger, PyColorize
+from IPython.ipstruct import Struct
+from IPython.excolors import ExceptionColors
+from IPython.genutils import Term,uniq_stable,error,info
+
+# Globals
+# amount of space to put line numbers before verbose tracebacks
+INDENT_SIZE = 8
+
+# Default color scheme.  This is used, for example, by the traceback
+# formatter.  When running in an actual IPython instance, the user's rc.colors
+# value is used, but havinga module global makes this functionality available
+# to users of ultraTB who are NOT running inside ipython.
+DEFAULT_SCHEME = 'NoColor'
+
+#---------------------------------------------------------------------------
+# Code begins
+
+# Utility functions
+def inspect_error():
+    """Print a message about internal inspect errors.
+
+    These are unfortunately quite common."""
+    
+    error('Internal Python error in the inspect module.\n'
+          'Below is the traceback from this internal error.\n')
+
+
+def findsource(object):
+    """Return the entire source file and starting line number for an object.
+
+    The argument may be a module, class, method, function, traceback, frame,
+    or code object.  The source code is returned as a list of all the lines
+    in the file and the line number indexes a line in that list.  An IOError
+    is raised if the source code cannot be retrieved.
+
+    FIXED version with which we monkeypatch the stdlib to work around a bug."""
+
+    file = getsourcefile(object) or getfile(object)
+    module = getmodule(object, file)
+    if module:
+        lines = linecache.getlines(file, module.__dict__)
+    else:
+        lines = linecache.getlines(file)
+    if not lines:
+        raise IOError('could not get source code')
+
+    if ismodule(object):
+        return lines, 0
+
+    if isclass(object):
+        name = object.__name__
+        pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
+        # make some effort to find the best matching class definition:
+        # use the one with the least indentation, which is the one
+        # that's most probably not inside a function definition.
+        candidates = []
+        for i in range(len(lines)):
+            match = pat.match(lines[i])
+            if match:
+                # if it's at toplevel, it's already the best one
+                if lines[i][0] == 'c':
+                    return lines, i
+                # else add whitespace to candidate list
+                candidates.append((match.group(1), i))
+        if candidates:
+            # this will sort by whitespace, and by line number,
+            # less whitespace first
+            candidates.sort()
+            return lines, candidates[0][1]
+        else:
+            raise IOError('could not find class definition')
+
+    if ismethod(object):
+        object = object.im_func
+    if isfunction(object):
+        object = object.func_code
+    if istraceback(object):
+        object = object.tb_frame
+    if isframe(object):
+        object = object.f_code
+    if iscode(object):
+        if not hasattr(object, 'co_firstlineno'):
+            raise IOError('could not find function definition')
+        pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
+        pmatch = pat.match
+        # fperez - fix: sometimes, co_firstlineno can give a number larger than
+        # the length of lines, which causes an error.  Safeguard against that.
+        lnum = min(object.co_firstlineno,len(lines))-1
+        while lnum > 0:
+            if pmatch(lines[lnum]): break
+            lnum -= 1
+ 
+        return lines, lnum
+    raise IOError('could not find code object')
+
+# Monkeypatch inspect to apply our bugfix.  This code only works with py25
+if sys.version_info[:2] >= (2,5):
+    inspect.findsource = findsource
+
+def _fixed_getinnerframes(etb, context=1,tb_offset=0):
+    import linecache
+    LNUM_POS, LINES_POS, INDEX_POS =  2, 4, 5
+
+    records  = inspect.getinnerframes(etb, context)
+
+    # If the error is at the console, don't build any context, since it would
+    # otherwise produce 5 blank lines printed out (there is no file at the
+    # console)
+    rec_check = records[tb_offset:]
+    try:
+        rname = rec_check[0][1]
+        if rname == '<ipython console>' or rname.endswith('<string>'):
+            return rec_check
+    except IndexError:
+        pass
+
+    aux = traceback.extract_tb(etb)
+    assert len(records) == len(aux)
+    for i, (file, lnum, _, _) in zip(range(len(records)), aux):
+        maybeStart = lnum-1 - context//2
+        start =  max(maybeStart, 0)
+        end   = start + context
+        lines = linecache.getlines(file)[start:end]
+        # pad with empty lines if necessary
+        if maybeStart < 0:
+            lines = (['\n'] * -maybeStart) + lines
+        if len(lines) < context:
+            lines += ['\n'] * (context - len(lines))
+        buf = list(records[i])
+        buf[LNUM_POS] = lnum
+        buf[INDEX_POS] = lnum - 1 - start
+        buf[LINES_POS] = lines
+        records[i] = tuple(buf)
+    return records[tb_offset:]
+
+# Helper function -- largely belongs to VerboseTB, but we need the same
+# functionality to produce a pseudo verbose TB for SyntaxErrors, so that they
+# can be recognized properly by ipython.el's py-traceback-line-re
+# (SyntaxErrors have to be treated specially because they have no traceback)
+
+_parser = PyColorize.Parser()
+    
+def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None):
+    numbers_width = INDENT_SIZE - 1
+    res = []
+    i = lnum - index
+
+    # This lets us get fully syntax-highlighted tracebacks.
+    if scheme is None:
+        try:
+            scheme = __IPYTHON__.rc.colors
+        except:
+            scheme = DEFAULT_SCHEME
+    _line_format = _parser.format2
+
+    for line in lines:
+        new_line, err = _line_format(line,'str',scheme)
+        if not err: line = new_line
+        
+        if i == lnum:
+            # This is the line with the error
+            pad = numbers_width - len(str(i))
+            if pad >= 3:
+                marker = '-'*(pad-3) + '-> '
+            elif pad == 2:
+                marker = '> '
+            elif pad == 1:
+                marker = '>'
+            else:
+                marker = ''
+            num = marker + str(i)
+            line = '%s%s%s %s%s' %(Colors.linenoEm, num, 
+                                   Colors.line, line, Colors.Normal)
+        else:
+            num = '%*s' % (numbers_width,i)
+            line = '%s%s%s %s' %(Colors.lineno, num, 
+                                 Colors.Normal, line)
+
+        res.append(line)
+        if lvals and i == lnum:
+            res.append(lvals + '\n')
+        i = i + 1
+    return res
+
+
+#---------------------------------------------------------------------------
+# Module classes
+class TBTools:
+    """Basic tools used by all traceback printer classes."""
+
+    def __init__(self,color_scheme = 'NoColor',call_pdb=False):
+        # Whether to call the interactive pdb debugger after printing
+        # tracebacks or not
+        self.call_pdb = call_pdb
+
+        # Create color table
+        self.color_scheme_table = ExceptionColors 
+
+        self.set_colors(color_scheme)
+        self.old_scheme = color_scheme  # save initial value for toggles
+
+        if call_pdb:
+            self.pdb = Debugger.Pdb(self.color_scheme_table.active_scheme_name)
+        else:
+            self.pdb = None
+
+    def set_colors(self,*args,**kw):
+        """Shorthand access to the color table scheme selector method."""
+
+        # Set own color table
+        self.color_scheme_table.set_active_scheme(*args,**kw)
+        # for convenience, set Colors to the active scheme
+        self.Colors = self.color_scheme_table.active_colors
+        # Also set colors of debugger
+        if hasattr(self,'pdb') and self.pdb is not None:
+            self.pdb.set_colors(*args,**kw)
+
+    def color_toggle(self):
+        """Toggle between the currently active color scheme and NoColor."""
+        
+        if self.color_scheme_table.active_scheme_name == 'NoColor':
+            self.color_scheme_table.set_active_scheme(self.old_scheme)
+            self.Colors = self.color_scheme_table.active_colors
+        else:
+            self.old_scheme = self.color_scheme_table.active_scheme_name
+            self.color_scheme_table.set_active_scheme('NoColor')
+            self.Colors = self.color_scheme_table.active_colors
+
+#---------------------------------------------------------------------------
+class ListTB(TBTools):
+    """Print traceback information from a traceback list, with optional color.
+        
+    Calling: requires 3 arguments:
+      (etype, evalue, elist)
+    as would be obtained by:
+      etype, evalue, tb = sys.exc_info()
+      if tb:
+        elist = traceback.extract_tb(tb)
+      else:
+        elist = None
+
+    It can thus be used by programs which need to process the traceback before
+    printing (such as console replacements based on the code module from the
+    standard library).
+
+    Because they are meant to be called without a full traceback (only a
+    list), instances of this class can't call the interactive pdb debugger."""
+
+    def __init__(self,color_scheme = 'NoColor'):
+        TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0)
+        
+    def __call__(self, etype, value, elist):
+        Term.cout.flush()
+        Term.cerr.flush()
+        print >> Term.cerr, self.text(etype,value,elist)
+
+    def text(self,etype, value, elist,context=5):
+        """Return a color formatted string with the traceback info."""
+
+        Colors = self.Colors
+        out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)]
+        if elist:
+            out_string.append('Traceback %s(most recent call last)%s:' % \
+                                (Colors.normalEm, Colors.Normal) + '\n')
+            out_string.extend(self._format_list(elist))
+        lines = self._format_exception_only(etype, value)
+        for line in lines[:-1]:
+            out_string.append(" "+line)
+        out_string.append(lines[-1])
+        return ''.join(out_string)
+
+    def _format_list(self, extracted_list):
+        """Format a list of traceback entry tuples for printing.
+
+        Given a list of tuples as returned by extract_tb() or
+        extract_stack(), return a list of strings ready for printing.
+        Each string in the resulting list corresponds to the item with the
+        same index in the argument list.  Each string ends in a newline;
+        the strings may contain internal newlines as well, for those items
+        whose source text line is not None.
+        
+        Lifted almost verbatim from traceback.py
+        """
+
+        Colors = self.Colors
+        list = []
+        for filename, lineno, name, line in extracted_list[:-1]:
+            item = '  File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \
+                    (Colors.filename, filename, Colors.Normal, 
+                     Colors.lineno, lineno, Colors.Normal,
+                     Colors.name, name, Colors.Normal)
+            if line:
+                item = item + '    %s\n' % line.strip()
+            list.append(item)
+        # Emphasize the last entry
+        filename, lineno, name, line = extracted_list[-1]
+        item = '%s  File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \
+                (Colors.normalEm,
+                 Colors.filenameEm, filename, Colors.normalEm,
+                 Colors.linenoEm, lineno, Colors.normalEm,
+                 Colors.nameEm, name, Colors.normalEm,
+                 Colors.Normal)
+        if line:
+            item = item + '%s    %s%s\n' % (Colors.line, line.strip(),
+                                            Colors.Normal)
+        list.append(item)
+        return list
+        
+    def _format_exception_only(self, etype, value):
+        """Format the exception part of a traceback.
+
+        The arguments are the exception type and value such as given by
+        sys.exc_info()[:2]. The return value is a list of strings, each ending
+        in a newline.  Normally, the list contains a single string; however,
+        for SyntaxError exceptions, it contains several lines that (when
+        printed) display detailed information about where the syntax error
+        occurred.  The message indicating which exception occurred is the
+        always last string in the list.
+        
+        Also lifted nearly verbatim from traceback.py
+        """
+        
+        Colors = self.Colors
+        list = []
+        try:
+            stype = Colors.excName + etype.__name__ + Colors.Normal
+        except AttributeError:
+            stype = etype  # String exceptions don't get special coloring
+        if value is None:
+            list.append( str(stype) + '\n')
+        else:
+            if etype is SyntaxError:
+                try:
+                    msg, (filename, lineno, offset, line) = value
+                except:
+                    pass
+                else:
+                    #print 'filename is',filename  # dbg
+                    if not filename: filename = "<string>"
+                    list.append('%s  File %s"%s"%s, line %s%d%s\n' % \
+                            (Colors.normalEm,
+                             Colors.filenameEm, filename, Colors.normalEm,
+                             Colors.linenoEm, lineno, Colors.Normal  ))
+                    if line is not None:
+                        i = 0
+                        while i < len(line) and line[i].isspace():
+                            i = i+1
+                        list.append('%s    %s%s\n' % (Colors.line,
+                                                      line.strip(), 
+                                                      Colors.Normal))
+                        if offset is not None:
+                            s = '    '
+                            for c in line[i:offset-1]:
+                                if c.isspace():
+                                    s = s + c
+                                else:
+                                    s = s + ' '
+                            list.append('%s%s^%s\n' % (Colors.caret, s,
+                                                       Colors.Normal) )
+                        value = msg
+            s = self._some_str(value)
+            if s:
+                list.append('%s%s:%s %s\n' % (str(stype), Colors.excName,
+                                              Colors.Normal, s))
+            else:
+                list.append('%s\n' % str(stype))
+        return list
+
+    def _some_str(self, value):
+        # Lifted from traceback.py
+        try:
+            return str(value)
+        except:
+            return '<unprintable %s object>' % type(value).__name__
+
+#----------------------------------------------------------------------------
+class VerboseTB(TBTools):
+    """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead
+    of HTML.  Requires inspect and pydoc.  Crazy, man.
+
+    Modified version which optionally strips the topmost entries from the
+    traceback, to be used with alternate interpreters (because their own code
+    would appear in the traceback)."""
+
+    def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0,
+                 call_pdb = 0, include_vars=1):
+        """Specify traceback offset, headers and color scheme.
+
+        Define how many frames to drop from the tracebacks. Calling it with
+        tb_offset=1 allows use of this handler in interpreters which will have
+        their own code at the top of the traceback (VerboseTB will first
+        remove that frame before printing the traceback info)."""
+        TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb)
+        self.tb_offset = tb_offset
+        self.long_header = long_header
+        self.include_vars = include_vars
+
+    def text(self, etype, evalue, etb, context=5):
+        """Return a nice text document describing the traceback."""
+
+        # some locals
+        try:
+            etype = etype.__name__
+        except AttributeError:
+            pass
+        Colors        = self.Colors   # just a shorthand + quicker name lookup
+        ColorsNormal  = Colors.Normal  # used a lot
+        col_scheme    = self.color_scheme_table.active_scheme_name
+        indent        = ' '*INDENT_SIZE
+        em_normal     = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal)
+        undefined     = '%sundefined%s' % (Colors.em, ColorsNormal)
+        exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal)
+
+        # some internal-use functions
+        def text_repr(value):
+            """Hopefully pretty robust repr equivalent."""
+            # this is pretty horrible but should always return *something*
+            try:
+                return pydoc.text.repr(value)
+            except KeyboardInterrupt:
+                raise
+            except:
+                try:
+                    return repr(value)
+                except KeyboardInterrupt:
+                    raise
+                except:
+                    try:
+                        # all still in an except block so we catch
+                        # getattr raising
+                        name = getattr(value, '__name__', None)
+                        if name:
+                            # ick, recursion
+                            return text_repr(name)
+                        klass = getattr(value, '__class__', None)
+                        if klass:
+                            return '%s instance' % text_repr(klass)
+                    except KeyboardInterrupt:
+                        raise
+                    except:
+                        return 'UNRECOVERABLE REPR FAILURE'
+        def eqrepr(value, repr=text_repr): return '=%s' % repr(value)
+        def nullrepr(value, repr=text_repr): return ''
+
+        # meat of the code begins
+        try:
+            etype = etype.__name__
+        except AttributeError:
+            pass
+
+        if self.long_header:
+            # Header with the exception type, python version, and date
+            pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable
+            date = time.ctime(time.time())
+            
+            head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal,
+                                           exc, ' '*(75-len(str(etype))-len(pyver)),
+                                           pyver, string.rjust(date, 75) )
+            head += "\nA problem occured executing Python code.  Here is the sequence of function"\
+                    "\ncalls leading up to the error, with the most recent (innermost) call last."
+        else:
+            # Simplified header
+            head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc,
+                                     string.rjust('Traceback (most recent call last)',
+                                                  75 - len(str(etype)) ) )
+        frames = []
+        # Flush cache before calling inspect.  This helps alleviate some of the
+        # problems with python 2.3's inspect.py.
+        linecache.checkcache()
+        # Drop topmost frames if requested
+        try:
+            # Try the default getinnerframes and Alex's: Alex's fixes some
+            # problems, but it generates empty tracebacks for console errors
+            # (5 blanks lines) where none should be returned.
+            #records = inspect.getinnerframes(etb, context)[self.tb_offset:]
+            #print 'python records:', records # dbg
+            records = _fixed_getinnerframes(etb, context,self.tb_offset)
+            #print 'alex   records:', records # dbg
+        except:
+
+            # FIXME: I've been getting many crash reports from python 2.3
+            # users, traceable to inspect.py.  If I can find a small test-case
+            # to reproduce this, I should either write a better workaround or
+            # file a bug report against inspect (if that's the real problem).
+            # So far, I haven't been able to find an isolated example to
+            # reproduce the problem.
+            inspect_error()
+            traceback.print_exc(file=Term.cerr)
+            info('\nUnfortunately, your original traceback can not be constructed.\n')
+            return ''
+
+        # build some color string templates outside these nested loops
+        tpl_link       = '%s%%s%s' % (Colors.filenameEm,ColorsNormal)
+        tpl_call       = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
+                                              ColorsNormal)
+        tpl_call_fail  = 'in %s%%s%s(***failed resolving arguments***)%s' % \
+                         (Colors.vName, Colors.valEm, ColorsNormal)
+        tpl_local_var  = '%s%%s%s' % (Colors.vName, ColorsNormal)
+        tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal,
+                                                 Colors.vName, ColorsNormal)
+        tpl_name_val   = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
+        tpl_line       = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal)
+        tpl_line_em    = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line,
+                                            ColorsNormal)
+
+        # now, loop over all records printing context and info
+        abspath = os.path.abspath
+        for frame, file, lnum, func, lines, index in records:
+            #print '*** record:',file,lnum,func,lines,index  # dbg
+            try:
+                file = file and abspath(file) or '?'
+            except OSError:
+                # if file is '<console>' or something not in the filesystem,
+                # the abspath call will throw an OSError.  Just ignore it and
+                # keep the original file string.
+                pass
+            link = tpl_link % file
+            try:
+                args, varargs, varkw, locals = inspect.getargvalues(frame)
+            except:
+                # This can happen due to a bug in python2.3.  We should be
+                # able to remove this try/except when 2.4 becomes a
+                # requirement.  Bug details at http://python.org/sf/1005466
+                inspect_error()
+                traceback.print_exc(file=Term.cerr)
+                info("\nIPython's exception reporting continues...\n")
+                
+            if func == '?':
+                call = ''
+            else:
+                # Decide whether to include variable details or not
+                var_repr = self.include_vars and eqrepr or nullrepr
+                try:
+                    call = tpl_call % (func,inspect.formatargvalues(args,
+                                                varargs, varkw,
+                                                locals,formatvalue=var_repr))
+                except KeyError:
+                    # Very odd crash from inspect.formatargvalues().  The
+                    # scenario under which it appeared was a call to
+                    # view(array,scale) in NumTut.view.view(), where scale had
+                    # been defined as a scalar (it should be a tuple). Somehow
+                    # inspect messes up resolving the argument list of view()
+                    # and barfs out. At some point I should dig into this one
+                    # and file a bug report about it.
+                    inspect_error()
+                    traceback.print_exc(file=Term.cerr)
+                    info("\nIPython's exception reporting continues...\n")
+                    call = tpl_call_fail % func
+
+            # Initialize a list of names on the current line, which the
+            # tokenizer below will populate.
+            names = []
+
+            def tokeneater(token_type, token, start, end, line):
+                """Stateful tokeneater which builds dotted names.
+
+                The list of names it appends to (from the enclosing scope) can
+                contain repeated composite names.  This is unavoidable, since
+                there is no way to disambguate partial dotted structures until
+                the full list is known.  The caller is responsible for pruning
+                the final list of duplicates before using it."""
+                
+                # build composite names
+                if token == '.':
+                    try:
+                        names[-1] += '.'
+                        # store state so the next token is added for x.y.z names
+                        tokeneater.name_cont = True
+                        return
+                    except IndexError:
+                        pass
+                if token_type == tokenize.NAME and token not in keyword.kwlist:
+                    if tokeneater.name_cont:
+                        # Dotted names
+                        names[-1] += token
+                        tokeneater.name_cont = False
+                    else:
+                        # Regular new names.  We append everything, the caller
+                        # will be responsible for pruning the list later.  It's
+                        # very tricky to try to prune as we go, b/c composite
+                        # names can fool us.  The pruning at the end is easy
+                        # to do (or the caller can print a list with repeated
+                        # names if so desired.
+                        names.append(token)
+                elif token_type == tokenize.NEWLINE:
+                    raise IndexError
+            # we need to store a bit of state in the tokenizer to build
+            # dotted names
+            tokeneater.name_cont = False
+
+            def linereader(file=file, lnum=[lnum], getline=linecache.getline):
+                line = getline(file, lnum[0])
+                lnum[0] += 1
+                return line
+
+            # Build the list of names on this line of code where the exception
+            # occurred.
+            try:
+                # This builds the names list in-place by capturing it from the
+                # enclosing scope.
+                tokenize.tokenize(linereader, tokeneater)
+            except IndexError:
+                # signals exit of tokenizer
+                pass
+            except tokenize.TokenError,msg:
+                _m = ("An unexpected error occurred while tokenizing input\n"
+                      "The following traceback may be corrupted or invalid\n"
+                      "The error message is: %s\n" % msg)
+                error(_m)
+            
+            # prune names list of duplicates, but keep the right order
+            unique_names = uniq_stable(names)
+
+            # Start loop over vars
+            lvals = []
+            if self.include_vars:
+                for name_full in unique_names:
+                    name_base = name_full.split('.',1)[0]
+                    if name_base in frame.f_code.co_varnames:
+                        if locals.has_key(name_base):
+                            try:
+                                value = repr(eval(name_full,locals))
+                            except:
+                                value = undefined
+                        else:
+                            value = undefined
+                        name = tpl_local_var % name_full
+                    else:
+                        if frame.f_globals.has_key(name_base):
+                            try:
+                                value = repr(eval(name_full,frame.f_globals))
+                            except:
+                                value = undefined
+                        else:
+                            value = undefined
+                        name = tpl_global_var % name_full
+                    lvals.append(tpl_name_val % (name,value))
+            if lvals:
+                lvals = '%s%s' % (indent,em_normal.join(lvals))
+            else:
+                lvals = ''
+
+            level = '%s %s\n' % (link,call)
+
+            if index is None:
+                frames.append(level)
+            else:
+                frames.append('%s%s' % (level,''.join(
+                    _formatTracebackLines(lnum,index,lines,Colors,lvals,
+                                          col_scheme))))
+
+        # Get (safely) a string form of the exception info
+        try:
+            etype_str,evalue_str = map(str,(etype,evalue))
+        except:
+            # User exception is improperly defined.
+            etype,evalue = str,sys.exc_info()[:2]
+            etype_str,evalue_str = map(str,(etype,evalue))
+        # ... and format it
+        exception = ['%s%s%s: %s' % (Colors.excName, etype_str,
+                                     ColorsNormal, evalue_str)]
+        if type(evalue) is types.InstanceType:
+            try:
+                names = [w for w in dir(evalue) if isinstance(w, basestring)]
+            except:
+                # Every now and then, an object with funny inernals blows up
+                # when dir() is called on it.  We do the best we can to report
+                # the problem and continue
+                _m = '%sException reporting error (object with broken dir())%s:'
+                exception.append(_m % (Colors.excName,ColorsNormal))
+                etype_str,evalue_str = map(str,sys.exc_info()[:2])
+                exception.append('%s%s%s: %s' % (Colors.excName,etype_str,
+                                     ColorsNormal, evalue_str))
+                names = []
+            for name in names:
+                value = text_repr(getattr(evalue, name))
+                exception.append('\n%s%s = %s' % (indent, name, value))
+        # return all our info assembled as a single string
+        return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
+
+    def debugger(self,force=False):
+        """Call up the pdb debugger if desired, always clean up the tb
+        reference.
+
+        Keywords:
+
+          - force(False): by default, this routine checks the instance call_pdb
+          flag and does not actually invoke the debugger if the flag is false.
+          The 'force' option forces the debugger to activate even if the flag
+          is false.
+
+        If the call_pdb flag is set, the pdb interactive debugger is
+        invoked. In all cases, the self.tb reference to the current traceback
+        is deleted to prevent lingering references which hamper memory
+        management.
+
+        Note that each call to pdb() does an 'import readline', so if your app
+        requires a special setup for the readline completers, you'll have to
+        fix that by hand after invoking the exception handler."""
+
+        if force or self.call_pdb:
+            if self.pdb is None:
+                self.pdb = Debugger.Pdb(
+                    self.color_scheme_table.active_scheme_name)
+            # the system displayhook may have changed, restore the original
+            # for pdb
+            dhook = sys.displayhook
+            sys.displayhook = sys.__displayhook__
+            self.pdb.reset()
+            # Find the right frame so we don't pop up inside ipython itself
+            if hasattr(self,'tb'):
+                etb = self.tb
+            else:
+                etb = self.tb = sys.last_traceback
+            while self.tb.tb_next is not None:
+                self.tb = self.tb.tb_next
+            try:
+                if etb and etb.tb_next:
+                    etb = etb.tb_next
+                self.pdb.botframe = etb.tb_frame
+                self.pdb.interaction(self.tb.tb_frame, self.tb)
+            finally:
+                sys.displayhook = dhook
+            
+        if hasattr(self,'tb'):
+            del self.tb
+
+    def handler(self, info=None):
+        (etype, evalue, etb) = info or sys.exc_info()
+        self.tb = etb
+        Term.cout.flush()
+        Term.cerr.flush()
+        print >> Term.cerr, self.text(etype, evalue, etb)
+
+    # Changed so an instance can just be called as VerboseTB_inst() and print
+    # out the right info on its own.
+    def __call__(self, etype=None, evalue=None, etb=None):
+        """This hook can replace sys.excepthook (for Python 2.1 or higher)."""
+        if etb is None:
+            self.handler()
+        else:
+            self.handler((etype, evalue, etb))
+        self.debugger()
+
+#----------------------------------------------------------------------------
+class FormattedTB(VerboseTB,ListTB):
+    """Subclass ListTB but allow calling with a traceback.
+
+    It can thus be used as a sys.excepthook for Python > 2.1.
+
+    Also adds 'Context' and 'Verbose' modes, not available in ListTB.
+
+    Allows a tb_offset to be specified. This is useful for situations where
+    one needs to remove a number of topmost frames from the traceback (such as
+    occurs with python programs that themselves execute other python code,
+    like Python shells).  """
+    
+    def __init__(self, mode = 'Plain', color_scheme='Linux',
+                 tb_offset = 0,long_header=0,call_pdb=0,include_vars=0):
+
+        # NEVER change the order of this list. Put new modes at the end:
+        self.valid_modes = ['Plain','Context','Verbose']
+        self.verbose_modes = self.valid_modes[1:3]
+
+        VerboseTB.__init__(self,color_scheme,tb_offset,long_header,
+                           call_pdb=call_pdb,include_vars=include_vars)
+        self.set_mode(mode)
+        
+    def _extract_tb(self,tb):
+        if tb:
+            return traceback.extract_tb(tb)
+        else:
+            return None
+
+    def text(self, etype, value, tb,context=5,mode=None):
+        """Return formatted traceback.
+
+        If the optional mode parameter is given, it overrides the current
+        mode."""
+
+        if mode is None:
+            mode = self.mode
+        if mode in self.verbose_modes:
+            # verbose modes need a full traceback
+            return VerboseTB.text(self,etype, value, tb,context=5)
+        else:
+            # We must check the source cache because otherwise we can print
+            # out-of-date source code.
+            linecache.checkcache()
+            # Now we can extract and format the exception
+            elist = self._extract_tb(tb)
+            if len(elist) > self.tb_offset:
+                del elist[:self.tb_offset]
+            return ListTB.text(self,etype,value,elist)
+
+    def set_mode(self,mode=None):
+        """Switch to the desired mode.
+
+        If mode is not specified, cycles through the available modes."""
+
+        if not mode:
+            new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \
+                      len(self.valid_modes)
+            self.mode = self.valid_modes[new_idx]
+        elif mode not in self.valid_modes:
+            raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\
+                  'Valid modes: '+str(self.valid_modes)
+        else:
+            self.mode = mode
+        # include variable details only in 'Verbose' mode
+        self.include_vars = (self.mode == self.valid_modes[2])
+
+    # some convenient shorcuts
+    def plain(self):
+        self.set_mode(self.valid_modes[0])
+
+    def context(self):
+        self.set_mode(self.valid_modes[1])
+
+    def verbose(self):
+        self.set_mode(self.valid_modes[2])
+
+#----------------------------------------------------------------------------
+class AutoFormattedTB(FormattedTB):
+    """A traceback printer which can be called on the fly.
+
+    It will find out about exceptions by itself.
+
+    A brief example:
+    
+    AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux')
+    try:
+      ...
+    except:
+      AutoTB()  # or AutoTB(out=logfile) where logfile is an open file object
+    """
+    def __call__(self,etype=None,evalue=None,etb=None,
+                 out=None,tb_offset=None):
+        """Print out a formatted exception traceback.
+
+        Optional arguments:
+          - out: an open file-like object to direct output to.
+
+          - tb_offset: the number of frames to skip over in the stack, on a
+          per-call basis (this overrides temporarily the instance's tb_offset
+          given at initialization time.  """
+        
+        if out is None:
+            out = Term.cerr
+        Term.cout.flush()
+        out.flush()
+        if tb_offset is not None:
+            tb_offset, self.tb_offset = self.tb_offset, tb_offset
+            print >> out, self.text(etype, evalue, etb)
+            self.tb_offset = tb_offset
+        else:
+            print >> out, self.text(etype, evalue, etb)
+        self.debugger()
+
+    def text(self,etype=None,value=None,tb=None,context=5,mode=None):
+        if etype is None:
+            etype,value,tb = sys.exc_info()
+        self.tb = tb
+        return FormattedTB.text(self,etype,value,tb,context=5,mode=mode)
+
+#---------------------------------------------------------------------------
+# A simple class to preserve Nathan's original functionality.
+class ColorTB(FormattedTB):
+    """Shorthand to initialize a FormattedTB in Linux colors mode."""
+    def __init__(self,color_scheme='Linux',call_pdb=0):
+        FormattedTB.__init__(self,color_scheme=color_scheme,
+                             call_pdb=call_pdb)
+
+#----------------------------------------------------------------------------
+# module testing (minimal)
+if __name__ == "__main__":
+    def spam(c, (d, e)):
+        x = c + d
+        y = c * d
+        foo(x, y)
+
+    def foo(a, b, bar=1):
+        eggs(a, b + bar)
+
+    def eggs(f, g, z=globals()):
+        h = f + g
+        i = f - g
+        return h / i
+
+    print ''
+    print '*** Before ***'
+    try:
+        print spam(1, (2, 3))
+    except:
+        traceback.print_exc()
+    print ''
+    
+    handler = ColorTB()
+    print '*** ColorTB ***'
+    try:
+        print spam(1, (2, 3))
+    except:
+        apply(handler, sys.exc_info() )
+    print ''
+    
+    handler = VerboseTB()
+    print '*** VerboseTB ***'
+    try:
+        print spam(1, (2, 3))
+    except:
+        apply(handler, sys.exc_info() )
+    print ''
+    
diff --git a/IPython/kernel/core/util.py b/IPython/kernel/core/util.py
new file mode 100644
index 0000000..7465aff
--- /dev/null
+++ b/IPython/kernel/core/util.py
@@ -0,0 +1,197 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+import sys
+
+
+# This class is mostly taken from IPython.
+class InputList(list):
+    """ Class to store user input.
+
+    It's basically a list, but slices return a string instead of a list, thus
+    allowing things like (assuming 'In' is an instance):
+
+    exec In[4:7]
+
+    or
+
+    exec In[5:9] + In[14] + In[21:25]
+    """
+
+    def __getslice__(self, i, j):
+        return ''.join(list.__getslice__(self, i, j))
+
+    def add(self, index, command):
+        """ Add a command to the list with the appropriate index.
+
+        If the index is greater than the current length of the list, empty
+        strings are added in between.
+        """
+
+        length = len(self)
+        if length == index:
+            self.append(command)
+        elif length > index:
+            self[index] = command
+        else:
+            extras = index - length
+            self.extend([''] * extras)
+            self.append(command)
+
+
+class Bunch(dict):
+    """ A dictionary that exposes its keys as attributes.
+    """
+
+    def __init__(self, *args, **kwds):
+        dict.__init__(self, *args, **kwds)
+        self.__dict__ = self
+
+
+def esc_quotes(strng):
+    """ Return the input string with single and double quotes escaped out.
+    """
+
+    return strng.replace('"', '\\"').replace("'", "\\'")
+
+def make_quoted_expr(s):
+    """Return string s in appropriate quotes, using raw string if possible.
+    
+    Effectively this turns string: cd \ao\ao\
+    to: r"cd \ao\ao\_"[:-1]
+    
+    Note the use of raw string and padding at the end to allow trailing
+    backslash.
+    """
+    
+    tail = ''
+    tailpadding = ''
+    raw  = ''
+    if "\\" in s:
+        raw = 'r'
+        if s.endswith('\\'):
+            tail = '[:-1]'
+            tailpadding = '_'
+    if '"' not in s:
+        quote = '"'
+    elif "'" not in s:
+        quote = "'"
+    elif '"""' not in s and not s.endswith('"'):
+        quote = '"""'
+    elif "'''" not in s and not s.endswith("'"):
+        quote = "'''"
+    else:
+        # Give up, backslash-escaped string will do
+        return '"%s"' % esc_quotes(s)
+    res = ''.join([raw, quote, s, tailpadding, quote, tail])
+    return res
+
+# This function is used by ipython in a lot of places to make system calls.
+# We need it to be slightly different under win32, due to the vagaries of
+# 'network shares'.  A win32 override is below.
+
+def system_shell(cmd, verbose=False, debug=False, header=''):
+    """ Execute a command in the system shell; always return None.
+
+    Parameters
+    ----------
+    cmd : str
+        The command to execute.
+    verbose : bool
+        If True, print the command to be executed.
+    debug : bool
+        Only print, do not actually execute.
+    header : str
+        Header to print to screen prior to the executed command. No extra
+        newlines are added.
+
+    Description
+    -----------
+    This returns None so it can be conveniently used in interactive loops
+    without getting the return value (typically 0) printed many times.
+    """
+
+    if verbose or debug: 
+        print header + cmd
+
+    # Flush stdout so we don't mangle python's buffering.
+    sys.stdout.flush()
+    if not debug:
+        os.system(cmd)
+
+# Override shell() for win32 to deal with network shares.
+if os.name in ('nt', 'dos'):
+
+    system_shell_ori = system_shell
+
+    def system_shell(cmd, verbose=False, debug=False, header=''):
+        if os.getcwd().startswith(r"\\"):
+            path = os.getcwd()
+            # Change to c drive (cannot be on UNC-share when issuing os.system,
+            # as cmd.exe cannot handle UNC addresses).
+            os.chdir("c:")
+            # Issue pushd to the UNC-share and then run the command.
+            try:
+                system_shell_ori('"pushd %s&&"'%path+cmd,verbose,debug,header)
+            finally:
+                os.chdir(path)
+        else:
+            system_shell_ori(cmd,verbose,debug,header)
+
+    system_shell.__doc__ = system_shell_ori.__doc__
+
+def getoutputerror(cmd, verbose=False, debug=False, header='', split=False):
+    """ Executes a command and returns the output.
+
+    Parameters
+    ----------
+    cmd : str
+        The command to execute.
+    verbose : bool
+        If True, print the command to be executed.
+    debug : bool
+        Only print, do not actually execute.
+    header : str
+        Header to print to screen prior to the executed command. No extra
+        newlines are added.
+    split : bool
+        If True, return the output as a list split on newlines.
+
+    """
+
+    if verbose or debug: 
+        print header+cmd
+
+    if not cmd:
+        # Return empty lists or strings.
+        if split:
+            return [], []
+        else:
+            return '', ''
+
+    if not debug:
+        # fixme: use subprocess.
+        pin,pout,perr = os.popen3(cmd)
+        tout = pout.read().rstrip()
+        terr = perr.read().rstrip()
+        pin.close()
+        pout.close()
+        perr.close()
+        if split:
+            return tout.split('\n'), terr.split('\n')
+        else:
+            return tout, terr
+
diff --git a/IPython/kernel/engineconnector.py b/IPython/kernel/engineconnector.py
new file mode 100644
index 0000000..93626e8
--- /dev/null
+++ b/IPython/kernel/engineconnector.py
@@ -0,0 +1,87 @@
+# encoding: utf-8
+
+"""A class that manages the engines connection to the controller."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+import cPickle as pickle
+
+from twisted.python import log
+
+from IPython.kernel.fcutil import find_furl
+from IPython.kernel.enginefc import IFCEngine
+
+#-------------------------------------------------------------------------------
+# The ClientConnector class
+#-------------------------------------------------------------------------------
+
+class EngineConnector(object):
+    """Manage an engines connection to a controller.
+    
+    This class takes a foolscap `Tub` and provides a `connect_to_controller` 
+    method that will use the `Tub` to connect to a controller and register
+    the engine with the controller.
+    """
+    
+    def __init__(self, tub):
+        self.tub = tub
+        
+    def connect_to_controller(self, engine_service, furl_or_file):
+        """
+        Make a connection to a controller specified by a furl.
+        
+        This method takes an `IEngineBase` instance and a foolcap URL and uses
+        the `tub` attribute to make a connection to the controller.  The 
+        foolscap URL contains all the information needed to connect to the 
+        controller, including the ip and port as well as any encryption and 
+        authentication information needed for the connection.
+        
+        After getting a reference to the controller, this method calls the 
+        `register_engine` method of the controller to actually register the 
+        engine.
+        
+        :Parameters:
+            engine_service : IEngineBase
+                An instance of an `IEngineBase` implementer
+            furl_or_file : str
+                A furl or a filename containing a furl
+        """
+        if not self.tub.running:
+            self.tub.startService()
+        self.engine_service = engine_service
+        self.engine_reference = IFCEngine(self.engine_service)
+        self.furl = find_furl(furl_or_file)
+        d = self.tub.getReference(self.furl)
+        d.addCallbacks(self._register, self._log_failure)
+        return d
+    
+    def _log_failure(self, reason):
+        log.err('engine registration failed:')
+        log.err(reason)
+        return reason
+
+    def _register(self, rr):
+        self.remote_ref = rr
+        # Now register myself with the controller
+        desired_id = self.engine_service.id
+        d = self.remote_ref.callRemote('register_engine', self.engine_reference, 
+            desired_id, os.getpid(), pickle.dumps(self.engine_service.properties,2))
+        return d.addCallbacks(self._reference_sent, self._log_failure)
+
+    def _reference_sent(self, registration_dict):
+        self.engine_service.id = registration_dict['id']
+        log.msg("engine registration succeeded, got id: %r" % self.engine_service.id)
+        return self.engine_service.id
+
diff --git a/IPython/kernel/enginefc.py b/IPython/kernel/enginefc.py
new file mode 100644
index 0000000..ebeff5c
--- /dev/null
+++ b/IPython/kernel/enginefc.py
@@ -0,0 +1,548 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_enginepb -*-
+
+"""
+Expose the IPython EngineService using the Foolscap network protocol.
+
+Foolscap is a high-performance and secure network protocol.
+"""
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os, time
+import cPickle as pickle
+
+from twisted.python import components, log, failure
+from twisted.python.failure import Failure
+from twisted.internet import defer, reactor, threads
+from twisted.internet.interfaces import IProtocolFactory
+from zope.interface import Interface, implements, Attribute
+
+from twisted.internet.base import DelayedCall
+DelayedCall.debug = True
+
+from foolscap import Referenceable, DeadReferenceError
+from foolscap.referenceable import RemoteReference
+
+from IPython.kernel.pbutil import packageFailure, unpackageFailure
+from IPython.kernel.util import printer
+from IPython.kernel.twistedutil import gatherBoth
+from IPython.kernel import newserialized
+from IPython.kernel.error import  ProtocolError
+from IPython.kernel import controllerservice
+from IPython.kernel.controllerservice import IControllerBase
+from IPython.kernel.engineservice import \
+    IEngineBase, \
+    IEngineQueued, \
+    EngineService, \
+    StrictDict
+from IPython.kernel.pickleutil import \
+    can, \
+    canDict, \
+    canSequence, \
+    uncan, \
+    uncanDict, \
+    uncanSequence
+
+
+#-------------------------------------------------------------------------------
+# The client (Engine) side of things
+#-------------------------------------------------------------------------------
+
+# Expose a FC interface to the EngineService
+     
+class IFCEngine(Interface):
+    """An interface that exposes an EngineService over Foolscap.
+    
+    The methods in this interface are similar to those from IEngine, 
+    but their arguments and return values slightly different to reflect
+    that FC cannot send arbitrary objects.  We handle this by pickling/
+    unpickling that the two endpoints.
+    
+    If a remote or local exception is raised, the appropriate Failure
+    will be returned instead.
+    """
+    pass
+    
+
+class FCEngineReferenceFromService(Referenceable, object):
+    """Adapt an `IEngineBase` to an `IFCEngine` implementer.
+    
+    This exposes an `IEngineBase` to foolscap by adapting it to a
+    `foolscap.Referenceable`.
+    
+    See the documentation of the `IEngineBase` methods for more details.
+    """
+        
+    implements(IFCEngine)
+    
+    def __init__(self, service):
+        assert IEngineBase.providedBy(service), \
+            "IEngineBase is not provided by" + repr(service)
+        self.service = service
+        self.collectors = {}
+    
+    def remote_get_id(self):
+        return self.service.id
+    
+    def remote_set_id(self, id):
+        self.service.id = id
+    
+    def _checkProperties(self, result):
+        dosync = self.service.properties.modified
+        self.service.properties.modified = False
+        return (dosync and pickle.dumps(self.service.properties, 2)), result
+    
+    def remote_execute(self, lines):
+        d = self.service.execute(lines)
+        d.addErrback(packageFailure)
+        d.addCallback(self._checkProperties)
+        d.addErrback(packageFailure)
+        #d.addCallback(lambda r: log.msg("Got result: " + str(r)))
+        return d
+        
+    #---------------------------------------------------------------------------
+    # Old version of push
+    #---------------------------------------------------------------------------
+        
+    def remote_push(self, pNamespace):
+        try:
+            namespace = pickle.loads(pNamespace)
+        except:
+            return defer.fail(failure.Failure()).addErrback(packageFailure)
+        else:
+            return self.service.push(namespace).addErrback(packageFailure)
+    
+    #---------------------------------------------------------------------------
+    # pull
+    #---------------------------------------------------------------------------     
+    
+    def remote_pull(self, keys):
+        d = self.service.pull(keys)
+        d.addCallback(pickle.dumps, 2)
+        d.addErrback(packageFailure)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # push/pullFuction
+    #---------------------------------------------------------------------------
+    
+    def remote_push_function(self, pNamespace):
+        try:
+            namespace = pickle.loads(pNamespace)
+        except:
+            return defer.fail(failure.Failure()).addErrback(packageFailure)
+        else:
+            # The usage of globals() here is an attempt to bind any pickled functions
+            # to the globals of this module.  What we really want is to have it bound
+            # to the globals of the callers module.  This will require walking the 
+            # stack.  BG 10/3/07.
+            namespace = uncanDict(namespace, globals())
+            return self.service.push_function(namespace).addErrback(packageFailure)
+    
+    def remote_pull_function(self, keys):
+        d = self.service.pull_function(keys)
+        if len(keys)>1:
+            d.addCallback(canSequence)
+        elif len(keys)==1:
+            d.addCallback(can)
+        d.addCallback(pickle.dumps, 2)
+        d.addErrback(packageFailure)
+        return d
+
+    #---------------------------------------------------------------------------
+    # Other methods
+    #---------------------------------------------------------------------------
+    
+    def remote_get_result(self, i=None):
+        return self.service.get_result(i).addErrback(packageFailure)
+    
+    def remote_reset(self):
+        return self.service.reset().addErrback(packageFailure)
+    
+    def remote_kill(self):
+        return self.service.kill().addErrback(packageFailure)
+    
+    def remote_keys(self):
+        return self.service.keys().addErrback(packageFailure)
+    
+    #---------------------------------------------------------------------------
+    # push/pull_serialized
+    #---------------------------------------------------------------------------
+    
+    def remote_push_serialized(self, pNamespace):
+        try:
+            namespace = pickle.loads(pNamespace)
+        except:
+            return defer.fail(failure.Failure()).addErrback(packageFailure)
+        else:
+            d = self.service.push_serialized(namespace)
+            return d.addErrback(packageFailure)
+    
+    def remote_pull_serialized(self, keys):
+        d = self.service.pull_serialized(keys)
+        d.addCallback(pickle.dumps, 2)
+        d.addErrback(packageFailure)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # Properties interface
+    #---------------------------------------------------------------------------
+    
+    def remote_set_properties(self, pNamespace):
+        try:
+            namespace = pickle.loads(pNamespace)
+        except:
+            return defer.fail(failure.Failure()).addErrback(packageFailure)
+        else:
+            return self.service.set_properties(namespace).addErrback(packageFailure)
+    
+    def remote_get_properties(self, keys=None):
+        d = self.service.get_properties(keys)
+        d.addCallback(pickle.dumps, 2)
+        d.addErrback(packageFailure)
+        return d
+    
+    def remote_has_properties(self, keys):
+        d = self.service.has_properties(keys)
+        d.addCallback(pickle.dumps, 2)
+        d.addErrback(packageFailure)
+        return d
+    
+    def remote_del_properties(self, keys):
+        d = self.service.del_properties(keys)
+        d.addErrback(packageFailure)
+        return d
+    
+    def remote_clear_properties(self):
+        d = self.service.clear_properties()
+        d.addErrback(packageFailure)
+        return d
+    
+
+components.registerAdapter(FCEngineReferenceFromService,
+                           IEngineBase,
+                           IFCEngine)
+
+
+#-------------------------------------------------------------------------------
+# Now the server (Controller) side of things
+#-------------------------------------------------------------------------------
+
+class EngineFromReference(object):
+    """Adapt a `RemoteReference` to an `IEngineBase` implementing object.
+    
+    When an engine connects to a controller, it calls the `register_engine`
+    method of the controller and passes the controller a `RemoteReference` to
+    itself.  This class is used to adapt this `RemoteReference` to an object
+    that implements the full `IEngineBase` interface.
+    
+    See the documentation of `IEngineBase` for details on the methods.
+    """
+    
+    implements(IEngineBase)
+    
+    def __init__(self, reference):
+        self.reference = reference
+        self._id = None
+        self._properties = StrictDict()
+        self.currentCommand = None
+    
+    def callRemote(self, *args, **kwargs):
+        try:
+            return self.reference.callRemote(*args, **kwargs)
+        except DeadReferenceError:
+            self.notifier()
+            self.stopNotifying(self.notifier)
+            return defer.fail()
+    
+    def get_id(self):
+        """Return the Engines id."""
+        return self._id
+    
+    def set_id(self, id):
+        """Set the Engines id."""
+        self._id = id
+        return self.callRemote('set_id', id)
+    
+    id = property(get_id, set_id)
+    
+    def syncProperties(self, r):
+        try:
+            psync, result = r
+        except (ValueError, TypeError):
+            return r
+        else:
+            if psync:
+                log.msg("sync properties")
+                pick = self.checkReturnForFailure(psync)
+                if isinstance(pick, failure.Failure):
+                    self.properties = pick
+                    return pick
+                else:
+                    self.properties = pickle.loads(pick)
+            return result
+    
+    def _set_properties(self, dikt):
+        self._properties.clear()
+        self._properties.update(dikt)
+    
+    def _get_properties(self):
+        if isinstance(self._properties, failure.Failure):
+            self._properties.raiseException()
+        return self._properties
+    
+    properties = property(_get_properties, _set_properties)
+    
+    #---------------------------------------------------------------------------
+    # Methods from IEngine
+    #---------------------------------------------------------------------------
+    
+    #---------------------------------------------------------------------------
+    # execute
+    #---------------------------------------------------------------------------
+    
+    def execute(self, lines):
+        # self._needProperties = True
+        d = self.callRemote('execute', lines)
+        d.addCallback(self.syncProperties)
+        return d.addCallback(self.checkReturnForFailure)
+    
+    #---------------------------------------------------------------------------
+    # push
+    #---------------------------------------------------------------------------
+    
+    def push(self, namespace):
+        try:
+            package = pickle.dumps(namespace, 2)
+        except:
+            return defer.fail(failure.Failure())
+        else:
+            if isinstance(package, failure.Failure):
+                return defer.fail(package)
+            else:
+                d = self.callRemote('push', package)
+                return d.addCallback(self.checkReturnForFailure)
+    
+    #---------------------------------------------------------------------------
+    # pull
+    #---------------------------------------------------------------------------
+    
+    def pull(self, keys):
+        d = self.callRemote('pull', keys)
+        d.addCallback(self.checkReturnForFailure)
+        d.addCallback(pickle.loads)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # push/pull_function
+    #---------------------------------------------------------------------------
+    
+    def push_function(self, namespace):
+        try:
+            package = pickle.dumps(canDict(namespace), 2)
+        except:
+            return defer.fail(failure.Failure())
+        else:
+            if isinstance(package, failure.Failure):
+                return defer.fail(package)
+            else:
+                d = self.callRemote('push_function', package)
+                return d.addCallback(self.checkReturnForFailure)    
+    
+    def pull_function(self, keys):
+        d = self.callRemote('pull_function', keys)
+        d.addCallback(self.checkReturnForFailure)
+        d.addCallback(pickle.loads)
+        # The usage of globals() here is an attempt to bind any pickled functions
+        # to the globals of this module.  What we really want is to have it bound
+        # to the globals of the callers module.  This will require walking the 
+        # stack.  BG 10/3/07.
+        if len(keys)==1:
+            d.addCallback(uncan, globals())
+        elif len(keys)>1:
+            d.addCallback(uncanSequence, globals())            
+        return d
+    
+    #---------------------------------------------------------------------------
+    # Other methods
+    #---------------------------------------------------------------------------
+    
+    def get_result(self, i=None):
+        return self.callRemote('get_result', i).addCallback(self.checkReturnForFailure)
+    
+    def reset(self):
+        self._refreshProperties = True
+        d = self.callRemote('reset')
+        d.addCallback(self.syncProperties)
+        return d.addCallback(self.checkReturnForFailure)
+    
+    def kill(self):
+        #this will raise pb.PBConnectionLost on success
+        d = self.callRemote('kill')
+        d.addCallback(self.syncProperties)
+        d.addCallback(self.checkReturnForFailure)
+        d.addErrback(self.killBack)
+        return d
+    
+    def killBack(self, f):
+        log.msg('filling engine: %s' % f)
+        return None
+    
+    def keys(self):
+        return self.callRemote('keys').addCallback(self.checkReturnForFailure)
+    
+    #---------------------------------------------------------------------------
+    # Properties methods
+    #---------------------------------------------------------------------------
+    
+    def set_properties(self, properties):
+        try:
+            package = pickle.dumps(properties, 2)
+        except:
+            return defer.fail(failure.Failure())
+        else:
+            if isinstance(package, failure.Failure):
+                return defer.fail(package)
+            else:
+                d = self.callRemote('set_properties', package)
+                return d.addCallback(self.checkReturnForFailure)
+        return d
+    
+    def get_properties(self, keys=None):
+        d = self.callRemote('get_properties', keys)
+        d.addCallback(self.checkReturnForFailure)
+        d.addCallback(pickle.loads)
+        return d
+    
+    def has_properties(self, keys):
+        d = self.callRemote('has_properties', keys)
+        d.addCallback(self.checkReturnForFailure)
+        d.addCallback(pickle.loads)
+        return d
+    
+    def del_properties(self, keys):
+        d = self.callRemote('del_properties', keys)
+        d.addCallback(self.checkReturnForFailure)
+        # d.addCallback(pickle.loads)
+        return d
+    
+    def clear_properties(self):
+        d = self.callRemote('clear_properties')
+        d.addCallback(self.checkReturnForFailure)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # push/pull_serialized
+    #---------------------------------------------------------------------------
+    
+    def push_serialized(self, namespace):
+        """Older version of pushSerialize."""
+        try:
+            package = pickle.dumps(namespace, 2)
+        except:
+            return defer.fail(failure.Failure())
+        else:
+            if isinstance(package, failure.Failure):
+                return defer.fail(package)
+            else:
+                d = self.callRemote('push_serialized', package)
+                return d.addCallback(self.checkReturnForFailure)
+    
+    def pull_serialized(self, keys):
+        d = self.callRemote('pull_serialized', keys)
+        d.addCallback(self.checkReturnForFailure)
+        d.addCallback(pickle.loads)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # Misc
+    #---------------------------------------------------------------------------
+     
+    def checkReturnForFailure(self, r):
+        """See if a returned value is a pickled Failure object.
+        
+        To distinguish between general pickled objects and pickled Failures, the
+        other side should prepend the string FAILURE: to any pickled Failure.
+        """
+        return unpackageFailure(r)
+    
+
+components.registerAdapter(EngineFromReference,
+    RemoteReference,
+    IEngineBase)
+
+
+#-------------------------------------------------------------------------------
+# Now adapt an IControllerBase to incoming FC connections
+#-------------------------------------------------------------------------------
+
+
+class IFCControllerBase(Interface):
+    """
+    Interface that tells how an Engine sees a Controller.
+    
+    In our architecture, the Controller listens for Engines to connect
+    and register.  This interface defines that registration method as it is 
+    exposed over the Foolscap network protocol
+    """
+    
+    def remote_register_engine(self, engineReference, id=None, pid=None, pproperties=None):
+        """
+        Register new engine on the controller.
+        
+        Engines must call this upon connecting to the controller if they
+        want to do work for the controller.
+        
+        See the documentation of `IControllerCore` for more details.
+        """
+    
+
+class FCRemoteEngineRefFromService(Referenceable):
+    """
+    Adapt an `IControllerBase` to an `IFCControllerBase`.
+    """
+    
+    implements(IFCControllerBase)
+    
+    def __init__(self, service):
+        assert IControllerBase.providedBy(service), \
+            "IControllerBase is not provided by " + repr(service)
+        self.service = service
+    
+    def remote_register_engine(self, engine_reference, id=None, pid=None, pproperties=None):
+        # First adapt the engine_reference to a basic non-queued engine
+        engine = IEngineBase(engine_reference)
+        if pproperties:
+            engine.properties = pickle.loads(pproperties)
+        # Make it an IQueuedEngine before registration
+        remote_engine = IEngineQueued(engine)
+        # Get the ip/port of the remote side
+        peer_address = engine_reference.tracker.broker.transport.getPeer()
+        ip = peer_address.host
+        port = peer_address.port
+        reg_dict = self.service.register_engine(remote_engine, id, ip, port, pid)
+        # Now setup callback for disconnect and unregistering the engine
+        def notify(*args):
+            return self.service.unregister_engine(reg_dict['id'])
+        engine_reference.tracker.broker.notifyOnDisconnect(notify)
+        
+        engine.notifier = notify
+        engine.stopNotifying = engine_reference.tracker.broker.dontNotifyOnDisconnect
+        
+        return reg_dict
+
+
+components.registerAdapter(FCRemoteEngineRefFromService,
+                        IControllerBase,
+                        IFCControllerBase)
diff --git a/IPython/kernel/engineservice.py b/IPython/kernel/engineservice.py
new file mode 100644
index 0000000..88ce0d3
--- /dev/null
+++ b/IPython/kernel/engineservice.py
@@ -0,0 +1,864 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.tests.test_engineservice -*-
+
+"""A Twisted Service Representation of the IPython core.
+
+The IPython Core exposed to the network is called the Engine.  Its
+representation in Twisted in the EngineService.  Interfaces and adapters
+are used to abstract out the details of the actual network protocol used.
+The EngineService is an Engine that knows nothing about the actual protocol
+used.
+
+The EngineService is exposed with various network protocols in modules like:
+
+enginepb.py
+enginevanilla.py
+
+As of 12/12/06 the classes in this module have been simplified greatly.  It was 
+felt that we had over-engineered things.  To improve the maintainability of the
+code we have taken out the ICompleteEngine interface and the completeEngine
+method that automatically added methods to engines.
+
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os, sys, copy
+import cPickle as pickle
+from new import instancemethod
+
+from twisted.application import service
+from twisted.internet import defer, reactor
+from twisted.python import log, failure, components
+import zope.interface as zi
+
+from IPython.kernel.core.interpreter import Interpreter
+from IPython.kernel import newserialized, error, util
+from IPython.kernel.util import printer
+from IPython.kernel.twistedutil import gatherBoth, DeferredList
+from IPython.kernel import codeutil
+
+
+#-------------------------------------------------------------------------------
+# Interface specification for the Engine
+#-------------------------------------------------------------------------------
+
+class IEngineCore(zi.Interface):
+    """The minimal required interface for the IPython Engine.
+    
+    This interface provides a formal specification of the IPython core.
+    All these methods should return deferreds regardless of what side of a
+    network connection they are on.
+    
+    In general, this class simply wraps a shell class and wraps its return
+    values as Deferred objects.  If the underlying shell class method raises
+    an exception, this class should convert it to a twisted.failure.Failure
+    that will be propagated along the Deferred's errback chain.
+    
+    In addition, Failures are aggressive.  By this, we mean that if a method
+    is performing multiple actions (like pulling multiple object) if any
+    single one fails, the entire method will fail with that Failure.  It is
+    all or nothing. 
+    """
+    
+    id = zi.interface.Attribute("the id of the Engine object")
+    properties = zi.interface.Attribute("A dict of properties of the Engine")
+    
+    def execute(lines):
+        """Execute lines of Python code.
+        
+        Returns a dictionary with keys (id, number, stdin, stdout, stderr)
+        upon success.
+        
+        Returns a failure object if the execution of lines raises an exception.
+        """
+    
+    def push(namespace):
+        """Push dict namespace into the user's namespace.
+        
+        Returns a deferred to None or a failure.
+        """
+    
+    def pull(keys):
+        """Pulls values out of the user's namespace by keys.
+        
+        Returns a deferred to a tuple objects or a single object.
+        
+        Raises NameError if any one of objects doess not exist.
+        """
+    
+    def push_function(namespace):
+        """Push a dict of key, function pairs into the user's namespace.
+        
+        Returns a deferred to None or a failure."""
+    
+    def pull_function(keys):
+        """Pulls functions out of the user's namespace by keys.
+        
+        Returns a deferred to a tuple of functions or a single function.
+        
+        Raises NameError if any one of the functions does not exist.
+        """
+    
+    def get_result(i=None):
+        """Get the stdin/stdout/stderr of command i.
+        
+        Returns a deferred to a dict with keys
+        (id, number, stdin, stdout, stderr).
+        
+        Raises IndexError if command i does not exist.
+        Raises TypeError if i in not an int.
+        """
+    
+    def reset():
+        """Reset the shell.
+        
+        This clears the users namespace.  Won't cause modules to be
+        reloaded.  Should also re-initialize certain variables like id.
+        """
+    
+    def kill():
+        """Kill the engine by stopping the reactor."""
+    
+    def keys():
+        """Return the top level variables in the users namspace.
+        
+        Returns a deferred to a dict."""
+    
+
+class IEngineSerialized(zi.Interface):
+    """Push/Pull methods that take Serialized objects.  
+    
+    All methods should return deferreds.
+    """
+    
+    def push_serialized(namespace):
+        """Push a dict of keys and Serialized objects into the user's namespace."""
+    
+    def pull_serialized(keys):
+        """Pull objects by key from the user's namespace as Serialized.
+        
+        Returns a list of or one Serialized.
+        
+        Raises NameError is any one of the objects does not exist.
+        """
+    
+
+class IEngineProperties(zi.Interface):
+    """Methods for access to the properties object of an Engine"""
+    
+    properties = zi.Attribute("A StrictDict object, containing the properties")
+    
+    def set_properties(properties):
+        """set properties by key and value"""
+    
+    def get_properties(keys=None):
+        """get a list of properties by `keys`, if no keys specified, get all"""
+    
+    def del_properties(keys):
+        """delete properties by `keys`"""
+    
+    def has_properties(keys):
+        """get a list of bool values for whether `properties` has `keys`"""
+
+    def clear_properties():
+        """clear the properties dict"""
+    
+class IEngineBase(IEngineCore, IEngineSerialized, IEngineProperties):
+    """The basic engine interface that EngineService will implement.
+    
+    This exists so it is easy to specify adapters that adapt to and from the
+    API that the basic EngineService implements.
+    """
+    pass
+
+class IEngineQueued(IEngineBase):
+    """Interface for adding a queue to an IEngineBase.  
+    
+    This interface extends the IEngineBase interface to add methods for managing
+    the engine's queue.  The implicit details of this interface are that the 
+    execution of all methods declared in IEngineBase should appropriately be
+    put through a queue before execution. 
+    
+    All methods should return deferreds.
+    """
+    
+    def clear_queue():
+        """Clear the queue."""
+    
+    def queue_status():
+        """Get the queued and pending commands in the queue."""
+    
+    def register_failure_observer(obs):
+        """Register an observer of pending Failures.
+        
+        The observer must implement IFailureObserver.
+        """
+    
+    def unregister_failure_observer(obs):
+        """Unregister an observer of pending Failures."""
+    
+
+class IEngineThreaded(zi.Interface):
+    """A place holder for threaded commands.  
+    
+    All methods should return deferreds.
+    """
+    pass
+
+
+#-------------------------------------------------------------------------------
+# Functions and classes to implement the EngineService
+#-------------------------------------------------------------------------------
+
+
+class StrictDict(dict):
+    """This is a strict copying dictionary for use as the interface to the 
+    properties of an Engine.
+    :IMPORTANT:
+        This object copies the values you set to it, and returns copies to you
+        when you request them.  The only way to change properties os explicitly
+        through the setitem and getitem of the dictionary interface.
+        Example:
+        >>> e = kernel.get_engine(id)
+        >>> L = someList
+        >>> e.properties['L'] = L
+        >>> L == e.properties['L']
+        ... True
+        >>> L.append(something Else)
+        >>> L == e.properties['L']
+        ... False
+        
+        getitem copies, so calls to methods of objects do not affect the
+        properties, as in the following example:
+        >>> e.properties[1] = range(2)
+        >>> print e.properties[1]
+        ... [0, 1]
+        >>> e.properties[1].append(2)
+        >>> print e.properties[1]
+        ... [0, 1]
+        
+    """
+    def __init__(self, *args, **kwargs):
+        dict.__init__(self, *args, **kwargs)
+        self.modified = True
+    
+    def __getitem__(self, key):
+        return copy.deepcopy(dict.__getitem__(self, key))
+    
+    def __setitem__(self, key, value):
+        # check if this entry is valid for transport around the network
+        # and copying
+        try:
+            pickle.dumps(key, 2)
+            pickle.dumps(value, 2)
+            newvalue = copy.deepcopy(value)
+        except:
+            raise error.InvalidProperty(value)
+        dict.__setitem__(self, key, newvalue)
+        self.modified = True
+    
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        self.modified = True
+    
+    def update(self, dikt):
+        for k,v in dikt.iteritems():
+            self[k] = v
+    
+    def pop(self, key):
+        self.modified = True
+        return dict.pop(self, key)
+    
+    def popitem(self):
+        self.modified = True
+        return dict.popitem(self)
+    
+    def clear(self):
+        self.modified = True
+        dict.clear(self)
+    
+    def subDict(self, *keys):
+        d = {}
+        for key in keys:
+            d[key] = self[key]
+        return d
+    
+
+
+class EngineAPI(object):
+    """This is the object through which the user can edit the `properties`
+    attribute of an Engine.
+    The Engine Properties object copies all object in and out of itself.
+    See the EngineProperties object for details.
+    """
+    _fix=False
+    def __init__(self, id):
+        self.id = id
+        self.properties = StrictDict()
+        self._fix=True
+    
+    def __setattr__(self, k,v):
+        if self._fix:
+            raise error.KernelError("I am protected!")
+        else:
+            object.__setattr__(self, k, v)
+    
+    def __delattr__(self, key):
+        raise error.KernelError("I am protected!")
+    
+
+_apiDict = {}
+
+def get_engine(id):
+    """Get the Engine API object, whcih currently just provides the properties 
+    object, by ID"""
+    global _apiDict
+    if not _apiDict.get(id):
+        _apiDict[id] = EngineAPI(id)
+    return _apiDict[id]
+
+def drop_engine(id):
+    """remove an engine"""
+    global _apiDict
+    if _apiDict.has_key(id):
+        del _apiDict[id]
+
+class EngineService(object, service.Service):
+    """Adapt a IPython shell into a IEngine implementing Twisted Service."""
+    
+    zi.implements(IEngineBase)
+    name = 'EngineService'
+    
+    def __init__(self, shellClass=Interpreter, mpi=None):
+        """Create an EngineService.
+        
+        shellClass: something that implements IInterpreter or core1
+        mpi:        an mpi module that has rank and size attributes
+        """
+        self.shellClass = shellClass
+        self.shell = self.shellClass()
+        self.mpi = mpi
+        self.id = None
+        self.properties = get_engine(self.id).properties
+        if self.mpi is not None:
+            log.msg("MPI started with rank = %i and size = %i" % 
+                (self.mpi.rank, self.mpi.size))
+            self.id = self.mpi.rank
+        self._seedNamespace()
+    
+    # Make id a property so that the shell can get the updated id
+        
+    def _setID(self, id):
+        self._id = id
+        self.properties = get_engine(id).properties
+        self.shell.push({'id': id})
+    
+    def _getID(self):
+        return self._id
+    
+    id = property(_getID, _setID)
+    
+    def _seedNamespace(self):
+        self.shell.push({'mpi': self.mpi, 'id' : self.id})
+    
+    def executeAndRaise(self, msg, callable, *args, **kwargs):
+        """Call a method of self.shell and wrap any exception."""
+        d = defer.Deferred()
+        try:
+            result = callable(*args, **kwargs)
+        except:
+            # This gives the following:
+            # et=exception class
+            # ev=exception class instance
+            # tb=traceback object
+            et,ev,tb = sys.exc_info()
+            # This call adds attributes to the exception value
+            et,ev,tb = self.shell.formatTraceback(et,ev,tb,msg)
+            # Add another attribute
+            ev._ipython_engine_info = msg
+            f = failure.Failure(ev,et,None)
+            d.errback(f)
+        else:
+            d.callback(result)
+            
+        return d
+    
+    # The IEngine methods.  See the interface for documentation.
+    
+    def execute(self, lines):
+        msg = {'engineid':self.id,
+               'method':'execute',
+               'args':[lines]}
+        d = self.executeAndRaise(msg, self.shell.execute, lines)
+        d.addCallback(self.addIDToResult)
+        return d
+    
+    def addIDToResult(self, result):
+        result['id'] = self.id
+        return result
+    
+    def push(self, namespace):
+        msg = {'engineid':self.id,
+               'method':'push',
+               'args':[repr(namespace.keys())]}
+        d = self.executeAndRaise(msg, self.shell.push, namespace)
+        return d
+    
+    def pull(self, keys):
+        msg = {'engineid':self.id,
+               'method':'pull',
+               'args':[repr(keys)]}
+        d = self.executeAndRaise(msg, self.shell.pull, keys)
+        return d
+    
+    def push_function(self, namespace):
+        msg = {'engineid':self.id,
+               'method':'push_function',
+               'args':[repr(namespace.keys())]}
+        d = self.executeAndRaise(msg, self.shell.push_function, namespace)
+        return d
+    
+    def pull_function(self, keys):
+        msg = {'engineid':self.id,
+               'method':'pull_function',
+               'args':[repr(keys)]}
+        d = self.executeAndRaise(msg, self.shell.pull_function, keys)
+        return d
+    
+    def get_result(self, i=None):
+        msg = {'engineid':self.id,
+               'method':'get_result',
+               'args':[repr(i)]}
+        d = self.executeAndRaise(msg, self.shell.getCommand, i)
+        d.addCallback(self.addIDToResult)
+        return d
+    
+    def reset(self):
+        msg = {'engineid':self.id,
+               'method':'reset',
+               'args':[]}
+        del self.shell
+        self.shell = self.shellClass()
+        self.properties.clear()
+        d = self.executeAndRaise(msg, self._seedNamespace)
+        return d
+    
+    def kill(self):
+        drop_engine(self.id)
+        try:
+            reactor.stop()
+        except RuntimeError:
+            log.msg('The reactor was not running apparently.')
+            return defer.fail()
+        else:
+            return defer.succeed(None)
+    
+    def keys(self):
+        """Return a list of variables names in the users top level namespace.
+        
+        This used to return a dict of all the keys/repr(values) in the 
+        user's namespace.  This was too much info for the ControllerService
+        to handle so it is now just a list of keys.
+        """
+        
+        remotes = []
+        for k in self.shell.user_ns.iterkeys():
+            if k not in ['__name__', '_ih', '_oh', '__builtins__',
+                         'In', 'Out', '_', '__', '___', '__IP', 'input', 'raw_input']:
+                remotes.append(k)
+        return defer.succeed(remotes)
+    
+    def set_properties(self, properties):
+        msg = {'engineid':self.id,
+               'method':'set_properties',
+               'args':[repr(properties.keys())]}
+        return self.executeAndRaise(msg, self.properties.update, properties)
+    
+    def get_properties(self, keys=None):
+        msg = {'engineid':self.id,
+               'method':'get_properties',
+               'args':[repr(keys)]}
+        if keys is None:
+            keys = self.properties.keys()
+        return self.executeAndRaise(msg, self.properties.subDict, *keys)
+    
+    def _doDel(self, keys):
+        for key in keys:
+            del self.properties[key]
+    
+    def del_properties(self, keys):
+        msg = {'engineid':self.id,
+               'method':'del_properties',
+               'args':[repr(keys)]}
+        return self.executeAndRaise(msg, self._doDel, keys)
+    
+    def _doHas(self, keys):
+        return [self.properties.has_key(key) for key in keys]
+    
+    def has_properties(self, keys):
+        msg = {'engineid':self.id,
+               'method':'has_properties',
+               'args':[repr(keys)]}
+        return self.executeAndRaise(msg, self._doHas, keys)
+    
+    def clear_properties(self):
+        msg = {'engineid':self.id,
+               'method':'clear_properties',
+               'args':[]}
+        return self.executeAndRaise(msg, self.properties.clear)
+    
+    def push_serialized(self, sNamespace):
+        msg = {'engineid':self.id,
+               'method':'push_serialized',
+               'args':[repr(sNamespace.keys())]}       
+        ns = {}
+        for k,v in sNamespace.iteritems():
+            try:
+                unserialized = newserialized.IUnSerialized(v)
+                ns[k] = unserialized.getObject()
+            except:
+                return defer.fail()
+        return self.executeAndRaise(msg, self.shell.push, ns)
+    
+    def pull_serialized(self, keys):
+        msg = {'engineid':self.id,
+               'method':'pull_serialized',
+               'args':[repr(keys)]}
+        if isinstance(keys, str):
+            keys = [keys]
+        if len(keys)==1:
+            d = self.executeAndRaise(msg, self.shell.pull, keys)
+            d.addCallback(newserialized.serialize)
+            return d
+        elif len(keys)>1:
+            d = self.executeAndRaise(msg, self.shell.pull, keys)         
+            @d.addCallback
+            def packThemUp(values):
+                serials = []
+                for v in values:
+                    try:
+                        serials.append(newserialized.serialize(v))
+                    except:
+                        return defer.fail(failure.Failure())
+                return serials
+            return packThemUp
+
+
+def queue(methodToQueue):
+    def queuedMethod(this, *args, **kwargs):
+        name = methodToQueue.__name__
+        return this.submitCommand(Command(name, *args, **kwargs))
+    return queuedMethod
+    
+class QueuedEngine(object):
+    """Adapt an IEngineBase to an IEngineQueued by wrapping it.
+    
+    The resulting object will implement IEngineQueued which extends
+    IEngineCore which extends (IEngineBase, IEngineSerialized). 
+    
+    This seems like the best way of handling it, but I am not sure.  The
+    other option is to have the various base interfaces be used like
+    mix-in intefaces.  The problem I have with this is adpatation is
+    more difficult and complicated because there can be can multiple
+    original and final Interfaces. 
+    """
+    
+    zi.implements(IEngineQueued)
+    
+    def __init__(self, engine):
+        """Create a QueuedEngine object from an engine
+        
+        engine:       An implementor of IEngineCore and IEngineSerialized
+        keepUpToDate: whether to update the remote status when the 
+                      queue is empty.  Defaults to False.
+        """
+        
+        # This is the right way to do these tests rather than 
+        # IEngineCore in list(zi.providedBy(engine)) which will only 
+        # picks of the interfaces that are directly declared by engine.
+        assert IEngineBase.providedBy(engine), \
+            "engine passed to QueuedEngine doesn't provide IEngineBase"
+            
+        self.engine = engine
+        self.id = engine.id
+        self.queued = []
+        self.history = {}
+        self.engineStatus = {}
+        self.currentCommand = None
+        self.failureObservers = []
+    
+    def _get_properties(self):
+        return self.engine.properties
+    
+    properties = property(_get_properties, lambda self, _: None)
+    # Queue management methods.  You should not call these directly
+    
+    def submitCommand(self, cmd):
+        """Submit command to queue."""
+        
+        d = defer.Deferred()
+        cmd.setDeferred(d)
+        if self.currentCommand is not None:
+            if self.currentCommand.finished:
+                # log.msg("Running command immediately: %r" % cmd)
+                self.currentCommand = cmd
+                self.runCurrentCommand()
+            else:  # command is still running  
+                # log.msg("Command is running: %r" % self.currentCommand)
+                # log.msg("Queueing: %r" % cmd)
+                self.queued.append(cmd)
+        else:
+            # log.msg("No current commands, running: %r" % cmd)
+            self.currentCommand = cmd
+            self.runCurrentCommand()
+        return d
+    
+    def runCurrentCommand(self):
+        """Run current command."""
+        
+        cmd = self.currentCommand
+        f = getattr(self.engine, cmd.remoteMethod, None)
+        if f:
+            d = f(*cmd.args, **cmd.kwargs)
+            if cmd.remoteMethod is 'execute':
+                d.addCallback(self.saveResult)
+            d.addCallback(self.finishCommand)
+            d.addErrback(self.abortCommand)
+        else:
+            return defer.fail(AttributeError(cmd.remoteMethod))
+    
+    def _flushQueue(self):
+        """Pop next command in queue and run it."""
+        
+        if len(self.queued) > 0:
+            self.currentCommand = self.queued.pop(0)
+            self.runCurrentCommand()
+    
+    def saveResult(self, result):
+        """Put the result in the history."""
+        self.history[result['number']] = result
+        return result
+    
+    def finishCommand(self, result):
+        """Finish currrent command."""
+        
+        # The order of these commands is absolutely critical.
+        self.currentCommand.handleResult(result)
+        self.currentCommand.finished = True
+        self._flushQueue()
+        return result
+    
+    def abortCommand(self, reason):
+        """Abort current command.
+        
+        This eats the Failure but first passes it onto the Deferred that the 
+        user has.
+        
+        It also clear out the queue so subsequence commands don't run.
+        """
+
+        # The order of these 3 commands is absolutely critical.  The currentCommand
+        # must first be marked as finished BEFORE the queue is cleared and before
+        # the current command is sent the failure.
+        # Also, the queue must be cleared BEFORE the current command is sent the Failure
+        # otherwise the errback chain could trigger new commands to be added to the 
+        # queue before we clear it.  We should clear ONLY the commands that were in
+        # the queue when the error occured. 
+        self.currentCommand.finished = True
+        s = "%r %r %r" % (self.currentCommand.remoteMethod, self.currentCommand.args, self.currentCommand.kwargs)
+        self.clear_queue(msg=s)
+        self.currentCommand.handleError(reason)
+        
+        return None
+    
+    #---------------------------------------------------------------------------
+    # IEngineCore methods
+    #---------------------------------------------------------------------------
+    
+    @queue
+    def execute(self, lines):
+        pass
+
+    @queue
+    def push(self, namespace):
+        pass      
+    
+    @queue
+    def pull(self, keys):
+        pass
+        
+    @queue
+    def push_function(self, namespace):
+        pass      
+    
+    @queue
+    def pull_function(self, keys):
+        pass        
+
+    def get_result(self, i=None):
+        if i is None:
+            i = max(self.history.keys()+[None])
+
+        cmd = self.history.get(i, None)
+        # Uncomment this line to disable chaching of results
+        #cmd = None
+        if cmd is None:
+            return self.submitCommand(Command('get_result', i))
+        else:
+            return defer.succeed(cmd)
+        
+    def reset(self):
+        self.clear_queue()
+        self.history = {}  # reset the cache - I am not sure we should do this
+        return self.submitCommand(Command('reset'))
+    
+    def kill(self):
+        self.clear_queue()
+        return self.submitCommand(Command('kill'))
+    
+    @queue
+    def keys(self):
+        pass
+    
+    #---------------------------------------------------------------------------
+    # IEngineSerialized methods
+    #---------------------------------------------------------------------------
+
+    @queue
+    def push_serialized(self, namespace):
+        pass
+        
+    @queue
+    def pull_serialized(self, keys):
+        pass
+    
+    #---------------------------------------------------------------------------
+    # IEngineProperties methods
+    #---------------------------------------------------------------------------
+
+    @queue
+    def set_properties(self, namespace):
+        pass
+        
+    @queue
+    def get_properties(self, keys=None):
+        pass
+    
+    @queue
+    def del_properties(self, keys):
+        pass
+    
+    @queue
+    def has_properties(self, keys):
+        pass
+    
+    @queue
+    def clear_properties(self):
+        pass
+    
+    #---------------------------------------------------------------------------
+    # IQueuedEngine methods
+    #---------------------------------------------------------------------------
+    
+    def clear_queue(self, msg=''):
+        """Clear the queue, but doesn't cancel the currently running commmand."""
+        
+        for cmd in self.queued:
+            cmd.deferred.errback(failure.Failure(error.QueueCleared(msg)))
+        self.queued = []
+        return defer.succeed(None)
+    
+    def queue_status(self):
+        if self.currentCommand is not None:
+            if self.currentCommand.finished:
+                pending = repr(None)
+            else:
+                pending = repr(self.currentCommand)
+        else:
+            pending = repr(None)
+        dikt = {'queue':map(repr,self.queued), 'pending':pending}
+        return defer.succeed(dikt)
+        
+    def register_failure_observer(self, obs):
+        self.failureObservers.append(obs)
+    
+    def unregister_failure_observer(self, obs):
+        self.failureObservers.remove(obs)
+    
+
+# Now register QueuedEngine as an adpater class that makes an IEngineBase into a
+# IEngineQueued.  
+components.registerAdapter(QueuedEngine, IEngineBase, IEngineQueued)
+    
+
+class Command(object):
+    """A command object that encapslates queued commands.
+    
+    This class basically keeps track of a command that has been queued
+    in a QueuedEngine.  It manages the deferreds and hold the method to be called
+    and the arguments to that method.
+    """
+    
+    
+    def __init__(self, remoteMethod, *args, **kwargs):
+        """Build a new Command object."""
+        
+        self.remoteMethod = remoteMethod
+        self.args = args
+        self.kwargs = kwargs
+        self.finished = False
+    
+    def setDeferred(self, d):
+        """Sets the deferred attribute of the Command."""  
+          
+        self.deferred = d
+    
+    def __repr__(self):
+        if not self.args:
+            args = ''
+        else:
+            args = str(self.args)[1:-2]  #cut off (...,)
+        for k,v in self.kwargs.iteritems():
+            if args:
+                args += ', '
+            args += '%s=%r' %(k,v)
+        return "%s(%s)" %(self.remoteMethod, args)
+    
+    def handleResult(self, result):
+        """When the result is ready, relay it to self.deferred."""
+        
+        self.deferred.callback(result)
+    
+    def handleError(self, reason):
+        """When an error has occured, relay it to self.deferred."""
+        
+        self.deferred.errback(reason)
+
+class ThreadedEngineService(EngineService):
+    
+    zi.implements(IEngineBase)
+
+    def __init__(self, shellClass=Interpreter, mpi=None):
+        EngineService.__init__(self, shellClass, mpi)
+        # Only import this if we are going to use this class
+        from twisted.internet import threads
+        
+    def execute(self, lines):
+        msg = """engine: %r
+method: execute(lines)
+lines = %s""" % (self.id, lines)
+        d = threads.deferToThread(self.executeAndRaise, msg, self.shell.execute, lines)
+        d.addCallback(self.addIDToResult)
+        return d
diff --git a/IPython/kernel/error.py b/IPython/kernel/error.py
new file mode 100644
index 0000000..3aaa78c
--- /dev/null
+++ b/IPython/kernel/error.py
@@ -0,0 +1,185 @@
+# encoding: utf-8
+
+"""Classes and functions for kernel related errors and exceptions."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.kernel.core import error
+from twisted.python import failure
+
+#-------------------------------------------------------------------------------
+# Error classes
+#-------------------------------------------------------------------------------
+
+class KernelError(error.IPythonError):
+    pass
+
+class NotDefined(KernelError):
+    def __init__(self, name):
+        self.name = name
+        self.args = (name,)
+
+    def __repr__(self):
+        return '<NotDefined: %s>' % self.name
+    
+    __str__ = __repr__
+
+class QueueCleared(KernelError):
+    pass
+
+class IdInUse(KernelError):
+    pass
+
+class ProtocolError(KernelError):
+    pass
+
+class ConnectionError(KernelError):
+    pass
+
+class InvalidEngineID(KernelError):
+    pass
+    
+class NoEnginesRegistered(KernelError):
+    pass
+    
+class InvalidClientID(KernelError):
+    pass
+    
+class InvalidDeferredID(KernelError):
+    pass
+    
+class SerializationError(KernelError):
+    pass
+    
+class MessageSizeError(KernelError):
+    pass
+    
+class PBMessageSizeError(MessageSizeError):
+    pass
+    
+class ResultNotCompleted(KernelError):
+    pass
+    
+class ResultAlreadyRetrieved(KernelError):
+    pass
+    
+class ClientError(KernelError):
+    pass
+
+class TaskAborted(KernelError):
+    pass
+
+class TaskTimeout(KernelError):
+    pass
+
+class NotAPendingResult(KernelError):
+    pass
+
+class UnpickleableException(KernelError):
+    pass
+
+class AbortedPendingDeferredError(KernelError):
+    pass
+
+class InvalidProperty(KernelError):
+    pass
+
+class MissingBlockArgument(KernelError):
+    pass
+
+class StopLocalExecution(KernelError):
+    pass
+
+class SecurityError(KernelError):
+    pass
+
+class CompositeError(KernelError):
+    def __init__(self, message, elist):
+        Exception.__init__(self, *(message, elist))
+        self.message = message
+        self.elist = elist
+  
+    def _get_engine_str(self, ev):
+        try:
+            ei = ev._ipython_engine_info
+        except AttributeError:
+            return '[Engine Exception]'
+        else:
+            return '[%i:%s]: ' % (ei['engineid'], ei['method'])
+    
+    def _get_traceback(self, ev):
+        try:
+            tb = ev._ipython_traceback_text
+        except AttributeError:
+            return 'No traceback available'
+        else:
+            return tb
+  
+    def __str__(self):
+        s = str(self.message)
+        for et, ev, etb in self.elist:
+            engine_str = self._get_engine_str(ev)
+            s = s + '\n' + engine_str + str(et.__name__) + ': ' + str(ev)
+        return s
+    
+    def print_tracebacks(self, excid=None):
+        if excid is None:
+            for (et,ev,etb) in self.elist:
+                print self._get_engine_str(ev)
+                print self._get_traceback(ev)
+                print
+        else:
+            try:
+                et,ev,etb = self.elist[excid]
+            except:
+                raise IndexError("an exception with index %i does not exist"%excid)
+            else:
+                print self._get_engine_str(ev)
+                print self._get_traceback(ev)
+    
+    def raise_exception(self, excid=0):
+        try:
+            et,ev,etb = self.elist[excid]
+        except:
+            raise IndexError("an exception with index %i does not exist"%excid)
+        else:
+            raise et, ev, etb
+
+def collect_exceptions(rlist, method):
+    elist = []
+    for r in rlist:
+        if isinstance(r, failure.Failure):
+            r.cleanFailure()
+            et, ev, etb = r.type, r.value, r.tb
+            # Sometimes we could have CompositeError in our list.  Just take
+            # the errors out of them and put them in our new list.  This 
+            # has the effect of flattening lists of CompositeErrors into one
+            # CompositeError
+            if et==CompositeError:
+                for e in ev.elist:
+                    elist.append(e)
+            else:
+                elist.append((et, ev, etb))
+    if len(elist)==0:
+        return rlist
+    else:
+        msg = "one or more exceptions from call to method: %s" % (method)
+        # This silliness is needed so the debugger has access to the exception
+        # instance (e in this case)
+        try:
+            raise CompositeError(msg, elist)
+        except CompositeError, e:
+            raise e
+            
+
diff --git a/IPython/kernel/fcutil.py b/IPython/kernel/fcutil.py
new file mode 100644
index 0000000..9f7c730
--- /dev/null
+++ b/IPython/kernel/fcutil.py
@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+"""Foolscap related utilities."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os
+
+from foolscap import Tub, UnauthenticatedTub
+
+def check_furl_file_security(furl_file, secure):
+    """Remove the old furl_file if changing security modes."""
+    
+    if os.path.isfile(furl_file):
+        f = open(furl_file, 'r')
+        oldfurl = f.read().strip()
+        f.close()
+        if (oldfurl.startswith('pb://') and not secure) or (oldfurl.startswith('pbu://') and secure):
+            os.remove(furl_file)
+
+def is_secure(furl):
+    if is_valid(furl):
+        if furl.startswith("pb://"):
+            return True
+        elif furl.startswith("pbu://"):
+            return False
+    else:
+        raise ValueError("invalid furl: %s" % furl)
+
+def is_valid(furl):
+    if isinstance(furl, str):
+        if furl.startswith("pb://") or furl.startswith("pbu://"):
+            return True
+    else:
+        return False
+
+def find_furl(furl_or_file):
+    if isinstance(furl_or_file, str):
+        if is_valid(furl_or_file):
+            return furl_or_file
+    if os.path.isfile(furl_or_file):
+        furl = open(furl_or_file, 'r').read().strip()
+        if is_valid(furl):
+            return furl
+    raise ValueError("not a furl or a file containing a furl: %s" % furl_or_file)
+
+# We do this so if a user doesn't have OpenSSL installed, it will try to use
+# an UnauthenticatedTub.  But, they will still run into problems if they
+# try to use encrypted furls.
+try:
+    import OpenSSL
+except:
+    Tub = UnauthenticatedTub
+    have_crypto = False
+else:
+    have_crypto = True
+
+
diff --git a/IPython/kernel/magic.py b/IPython/kernel/magic.py
new file mode 100644
index 0000000..cefca8b
--- /dev/null
+++ b/IPython/kernel/magic.py
@@ -0,0 +1,171 @@
+# encoding: utf-8
+
+"""Magic command interface for interactive parallel work."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import new
+
+from IPython.iplib import InteractiveShell
+from IPython.Shell import MTInteractiveShell
+
+from twisted.internet.defer import Deferred
+
+
+#-------------------------------------------------------------------------------
+# Definitions of magic functions for use with IPython
+#-------------------------------------------------------------------------------
+
+NO_ACTIVE_CONTROLLER = """
+Error:  No Controller is activated
+Use activate() on a RemoteController object to activate it for magics.
+"""
+
+def magic_result(self,parameter_s=''):
+    """Print the result of command i on all engines of the active controller.
+    
+    To activate a controller in IPython, first create it and then call
+    the activate() method.
+    
+    Then you can do the following:
+    
+    >>> result                                # Print the latest result
+    Printing result... 
+    [127.0.0.1:0] In [1]: b = 10
+    [127.0.0.1:1] In [1]: b = 10
+    
+    >>> result 0                              # Print result 0
+    In [14]: result 0
+    Printing result... 
+    [127.0.0.1:0] In [0]: a = 5
+    [127.0.0.1:1] In [0]: a = 5
+    """
+    try:
+        activeController = __IPYTHON__.activeController
+    except AttributeError:
+        print NO_ACTIVE_CONTROLLER
+    else:
+        try:
+            index = int(parameter_s)
+        except:
+            index = None
+        result = activeController.get_result(index)
+        return result
+
+def magic_px(self,parameter_s=''):
+    """Executes the given python command on the active IPython Controller.
+    
+    To activate a Controller in IPython, first create it and then call
+    the activate() method.
+    
+    Then you can do the following:
+     
+    >>> %px a = 5       # Runs a = 5 on all nodes
+    """
+
+    try:
+        activeController = __IPYTHON__.activeController
+    except AttributeError:
+        print NO_ACTIVE_CONTROLLER
+    else:
+        print "Executing command on Controller"
+        result = activeController.execute(parameter_s)
+        return result
+
+def pxrunsource(self, source, filename="<input>", symbol="single"):
+
+    try:
+        code = self.compile(source, filename, symbol)
+    except (OverflowError, SyntaxError, ValueError):
+        # Case 1
+        self.showsyntaxerror(filename)
+        return None
+
+    if code is None:
+        # Case 2
+        return True
+
+    # Case 3
+    # Because autopx is enabled, we now call executeAll or disable autopx if
+    # %autopx or autopx has been called
+    if '_ip.magic("%autopx' in source or '_ip.magic("autopx' in source:
+        _disable_autopx(self)
+        return False
+    else:
+        try:
+            result = self.activeController.execute(source)
+        except:
+            self.showtraceback()
+        else:
+            print result.__repr__()
+        return False
+        
+def magic_autopx(self, parameter_s=''):
+    """Toggles auto parallel mode for the active IPython Controller.
+    
+    To activate a Controller in IPython, first create it and then call
+    the activate() method.
+    
+    Then you can do the following:
+     
+    >>> %autopx                    # Now all commands are executed in parallel
+    Auto Parallel Enabled
+    Type %autopx to disable
+    ...
+    >>> %autopx                    # Now all commands are locally executed
+    Auto Parallel Disabled
+    """
+  
+    if hasattr(self, 'autopx'):
+        if self.autopx == True:
+            _disable_autopx(self)
+        else:
+            _enable_autopx(self)
+    else:
+        _enable_autopx(self)
+
+def _enable_autopx(self):
+    """Enable %autopx mode by saving the original runsource and installing 
+    pxrunsource.
+    """
+    try:
+        activeController = __IPYTHON__.activeController
+    except AttributeError:
+        print "No active RemoteController found, use RemoteController.activate()."
+    else:
+        self._original_runsource = self.runsource
+        self.runsource = new.instancemethod(pxrunsource, self, self.__class__)
+        self.autopx = True
+        print "Auto Parallel Enabled\nType %autopx to disable"
+
+def _disable_autopx(self):
+    """Disable %autopx by restoring the original runsource."""
+    if hasattr(self, 'autopx'):
+        if self.autopx == True:
+            self.runsource = self._original_runsource
+            self.autopx = False
+            print "Auto Parallel Disabled"
+            
+# Add the new magic function to the class dict:
+
+InteractiveShell.magic_result = magic_result
+InteractiveShell.magic_px = magic_px
+InteractiveShell.magic_autopx = magic_autopx
+
+# And remove the global name to keep global namespace clean.  Don't worry, the
+# copy bound to IPython stays, we're just removing the global name.
+del magic_result
+del magic_px
+del magic_autopx
+
diff --git a/IPython/kernel/map.py b/IPython/kernel/map.py
new file mode 100644
index 0000000..2e0b932
--- /dev/null
+++ b/IPython/kernel/map.py
@@ -0,0 +1,121 @@
+# encoding: utf-8
+
+"""Classes used in scattering and gathering sequences.
+
+Scattering consists of partitioning a sequence and sending the various
+pieces to individual nodes in a cluster.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import types
+
+from IPython.genutils import flatten as genutil_flatten
+
+#-------------------------------------------------------------------------------
+# Figure out which array packages are present and their array types
+#-------------------------------------------------------------------------------
+
+arrayModules = []
+try:
+    import Numeric
+except ImportError:
+    pass
+else:
+    arrayModules.append({'module':Numeric, 'type':Numeric.arraytype})
+try:
+    import numpy
+except ImportError:
+    pass
+else:
+    arrayModules.append({'module':numpy, 'type':numpy.ndarray})
+try:
+    import numarray
+except ImportError:
+    pass
+else:
+    arrayModules.append({'module':numarray,
+        'type':numarray.numarraycore.NumArray})
+
+class Map:
+    """A class for partitioning a sequence using a map."""
+            
+    def getPartition(self, seq, p, q):
+        """Returns the pth partition of q partitions of seq."""
+        
+        # Test for error conditions here
+        if p<0 or p>=q:
+          print "No partition exists."
+          return
+          
+        remainder = len(seq)%q
+        basesize = len(seq)/q
+        hi = []
+        lo = []
+        for n in range(q):
+            if n < remainder:
+                lo.append(n * (basesize + 1))
+                hi.append(lo[-1] + basesize + 1)
+            else:
+                lo.append(n*basesize + remainder)
+                hi.append(lo[-1] + basesize)
+
+        
+        result = seq[lo[p]:hi[p]]
+        return result
+           
+    def joinPartitions(self, listOfPartitions):
+        return self.concatenate(listOfPartitions)
+                    
+    def concatenate(self, listOfPartitions):
+        testObject = listOfPartitions[0]
+        # First see if we have a known array type
+        for m in arrayModules:
+            #print m
+            if isinstance(testObject, m['type']):
+                return m['module'].concatenate(listOfPartitions)
+        # Next try for Python sequence types
+        if isinstance(testObject, (types.ListType, types.TupleType)):
+            return genutil_flatten(listOfPartitions)
+        # If we have scalars, just return listOfPartitions
+        return listOfPartitions
+
+class RoundRobinMap(Map):
+    """Partitions a sequence in a roun robin fashion.
+    
+    This currently does not work!
+    """
+
+    def getPartition(self, seq, p, q):
+        return seq[p:len(seq):q]
+        #result = []
+        #for i in range(p,len(seq),q):
+        #    result.append(seq[i])
+        #return result
+
+    def joinPartitions(self, listOfPartitions):
+        #lengths = [len(x) for x in listOfPartitions]
+        #maxPartitionLength = len(listOfPartitions[0])
+        #numberOfPartitions = len(listOfPartitions)
+        #concat = self.concatenate(listOfPartitions)
+        #totalLength = len(concat)
+        #result = []
+        #for i in range(maxPartitionLength):
+        #    result.append(concat[i:totalLength:maxPartitionLength])
+        return self.concatenate(listOfPartitions)
+        
+styles = {'basic':Map}
+
+    
+    
diff --git a/IPython/kernel/multiengine.py b/IPython/kernel/multiengine.py
new file mode 100644
index 0000000..930f05f
--- /dev/null
+++ b/IPython/kernel/multiengine.py
@@ -0,0 +1,780 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_multiengine -*-
+
+"""Adapt the IPython ControllerServer to IMultiEngine.
+
+This module provides classes that adapt a ControllerService to the 
+IMultiEngine interface.  This interface is a basic interactive interface
+for working with a set of engines where it is desired to have explicit 
+access to each registered engine.  
+
+The classes here are exposed to the network in files like:
+
+* multienginevanilla.py
+* multienginepb.py
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from new import instancemethod
+from types import FunctionType
+
+from twisted.application import service
+from twisted.internet import defer, reactor
+from twisted.python import log, components, failure
+from zope.interface import Interface, implements, Attribute
+
+from IPython.tools import growl
+from IPython.kernel.util import printer
+from IPython.kernel.twistedutil import gatherBoth
+from IPython.kernel import map as Map
+from IPython.kernel import error
+from IPython.kernel.pendingdeferred import PendingDeferredManager, two_phase
+from IPython.kernel.controllerservice import \
+    ControllerAdapterBase, \
+    ControllerService, \
+    IControllerBase
+
+
+#-------------------------------------------------------------------------------
+# Interfaces for the MultiEngine representation of a controller
+#-------------------------------------------------------------------------------
+
+class IEngineMultiplexer(Interface):
+    """Interface to multiple engines implementing IEngineCore/Serialized/Queued.
+    
+    This class simply acts as a multiplexer of methods that are in the 
+    various IEngines* interfaces.  Thus the methods here are jut like those 
+    in the IEngine* interfaces, but with an extra first argument, targets.  
+    The targets argument can have the following forms:
+    
+    * targets = 10            # Engines are indexed by ints
+    * targets = [0,1,2,3]     # A list of ints
+    * targets = 'all'         # A string to indicate all targets
+    
+    If targets is bad in any way, an InvalidEngineID will be raised.  This
+    includes engines not being registered.
+    
+    All IEngineMultiplexer multiplexer methods must return a Deferred to a list 
+    with length equal to the number of targets.  The elements of the list will 
+    correspond to the return of the corresponding IEngine method.
+    
+    Failures are aggressive, meaning that if an action fails for any target, 
+    the overall action will fail immediately with that Failure.
+    
+    :Parameters:
+        targets : int, list of ints, or 'all'
+            Engine ids the action will apply to.
+    
+    :Returns: Deferred to a list of results for each engine.
+    
+    :Exception:
+        InvalidEngineID
+            If the targets argument is bad or engines aren't registered.
+        NoEnginesRegistered
+            If there are no engines registered and targets='all'
+    """
+        
+    #---------------------------------------------------------------------------
+    # Mutiplexed methods
+    #---------------------------------------------------------------------------
+     
+    def execute(lines, targets='all'):
+        """Execute lines of Python code on targets.
+              
+        See the class docstring for information about targets and possible
+        exceptions this method can raise.
+              
+        :Parameters:
+            lines : str
+                String of python code to be executed on targets.
+        """
+            
+    def push(namespace, targets='all'):
+        """Push dict namespace into the user's namespace on targets.
+        
+        See the class docstring for information about targets and possible
+        exceptions this method can raise.
+        
+        :Parameters:
+            namspace : dict
+                Dict of key value pairs to be put into the users namspace.
+        """
+        
+    def pull(keys, targets='all'):
+        """Pull values out of the user's namespace on targets by keys.
+        
+        See the class docstring for information about targets and possible
+        exceptions this method can raise.
+        
+        :Parameters:
+            keys : tuple of strings
+                Sequence of keys to be pulled from user's namespace.
+        """
+          
+    def push_function(namespace, targets='all'):
+        """"""
+        
+    def pull_function(keys, targets='all'):
+        """"""
+                
+    def get_result(i=None, targets='all'):
+        """Get the result for command i from targets.
+        
+        See the class docstring for information about targets and possible
+        exceptions this method can raise.
+        
+        :Parameters:
+            i : int or None
+                Command index or None to indicate most recent command.                
+        """
+        
+    def reset(targets='all'):
+        """Reset targets.
+        
+        This clears the users namespace of the Engines, but won't cause
+        modules to be reloaded.
+        """
+        
+    def keys(targets='all'):
+        """Get variable names defined in user's namespace on targets."""
+        
+    def kill(controller=False, targets='all'):
+        """Kill the targets Engines and possibly the controller.
+        
+        :Parameters:
+            controller : boolean
+                Should the controller be killed as well.  If so all the 
+                engines will be killed first no matter what targets is.
+        """
+        
+    def push_serialized(namespace, targets='all'):
+        """Push a namespace of Serialized objects to targets.
+        
+        :Parameters:
+            namespace : dict
+                A dict whose keys are the variable names and whose values
+                are serialized version of the objects.
+        """
+        
+    def pull_serialized(keys, targets='all'):
+        """Pull Serialized objects by keys from targets.
+        
+        :Parameters:
+            keys : tuple of strings
+                Sequence of variable names to pull as serialized objects.
+        """
+        
+    def clear_queue(targets='all'):
+        """Clear the queue of pending command for targets."""
+        
+    def queue_status(targets='all'):
+        """Get the status of the queue on the targets."""
+    
+    def set_properties(properties, targets='all'):
+        """set properties by key and value"""
+    
+    def get_properties(keys=None, targets='all'):
+        """get a list of properties by `keys`, if no keys specified, get all"""
+    
+    def del_properties(keys, targets='all'):
+        """delete properties by `keys`"""
+    
+    def has_properties(keys, targets='all'):
+        """get a list of bool values for whether `properties` has `keys`"""
+    
+    def clear_properties(targets='all'):
+        """clear the properties dict"""
+
+
+class IMultiEngine(IEngineMultiplexer):
+    """A controller that exposes an explicit interface to all of its engines.
+    
+    This is the primary inteface for interactive usage.
+    """
+    
+    def get_ids():
+        """Return list of currently registered ids.
+                
+        :Returns:  A Deferred to a list of registered engine ids.
+        """
+
+
+
+#-------------------------------------------------------------------------------
+# Implementation of the core MultiEngine classes
+#-------------------------------------------------------------------------------
+
+class MultiEngine(ControllerAdapterBase):
+    """The representation of a ControllerService as a IMultiEngine.
+    
+    Although it is not implemented currently, this class would be where a
+    client/notification API is implemented.  It could inherit from something
+    like results.NotifierParent and then use the notify method to send
+    notifications.
+    """
+    
+    implements(IMultiEngine)
+    
+    def __init(self, controller):
+        ControllerAdapterBase.__init__(self, controller)
+    
+    #---------------------------------------------------------------------------
+    # Helper methods
+    #---------------------------------------------------------------------------
+    
+    def engineList(self, targets):
+        """Parse the targets argument into a list of valid engine objects.
+        
+        :Parameters:
+            targets : int, list of ints or 'all'
+                The targets argument to be parsed.
+                
+        :Returns: List of engine objects.
+        
+        :Exception:
+            InvalidEngineID
+                If targets is not valid or if an engine is not registered.
+        """
+        if isinstance(targets, int):
+            if targets not in self.engines.keys():
+                log.msg("Engine with id %i is not registered" % targets)
+                raise error.InvalidEngineID("Engine with id %i is not registered" % targets)
+            else: 
+                return [self.engines[targets]]
+        elif isinstance(targets, (list, tuple)):
+            for id in targets:
+                if id not in self.engines.keys():
+                    log.msg("Engine with id %r is not registered" % id)
+                    raise error.InvalidEngineID("Engine with id %r is not registered" % id)  
+            return map(self.engines.get, targets)
+        elif targets == 'all':
+            eList = self.engines.values()
+            if len(eList) == 0:
+                msg = """There are no engines registered.
+                     Check the logs in ~/.ipython/log if you think there should have been."""
+                raise error.NoEnginesRegistered(msg)
+            else:
+                return eList
+        else:
+            raise error.InvalidEngineID("targets argument is not an int, list of ints or 'all': %r"%targets)
+    
+    def _performOnEngines(self, methodName, *args, **kwargs):
+        """Calls a method on engines and returns deferred to list of results.
+        
+        :Parameters:
+            methodName : str
+                Name of the method to be called.
+            targets : int, list of ints, 'all'
+                The targets argument to be parsed into a list of engine objects.
+            args
+                The positional keyword arguments to be passed to the engines.
+            kwargs
+                The keyword arguments passed to the method
+                
+        :Returns: List of deferreds to the results on each engine
+        
+        :Exception:
+            InvalidEngineID
+                If the targets argument is bad in any way.
+            AttributeError
+                If the method doesn't exist on one of the engines.
+        """
+        targets = kwargs.pop('targets')
+        log.msg("Performing %s on %r" % (methodName, targets))
+        # log.msg("Performing %s(%r, %r) on %r" % (methodName, args, kwargs, targets))
+        # This will and should raise if targets is not valid!
+        engines = self.engineList(targets)
+        dList = []
+        for e in engines:
+            meth = getattr(e, methodName, None)
+            if meth is not None:
+                dList.append(meth(*args, **kwargs))
+            else:
+                raise AttributeError("Engine %i does not have method %s" % (e.id, methodName))
+        return dList
+        
+    def _performOnEnginesAndGatherBoth(self, methodName, *args, **kwargs):
+        """Called _performOnEngines and wraps result/exception into deferred."""
+        try:
+            dList = self._performOnEngines(methodName, *args, **kwargs)
+        except (error.InvalidEngineID, AttributeError, KeyError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())
+        else:
+            # Having fireOnOneErrback is causing problems with the determinacy
+            # of the system.  Basically, once a single engine has errbacked, this
+            # method returns.  In some cases, this will cause client to submit
+            # another command.  Because the previous command is still running
+            # on some engines, this command will be queued.  When those commands
+            # then errback, the second command will raise QueueCleared.  Ahhh!
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, methodName)
+            return d
+              
+    #---------------------------------------------------------------------------
+    # General IMultiEngine methods
+    #---------------------------------------------------------------------------
+    
+    def get_ids(self):
+        return defer.succeed(self.engines.keys())
+    
+    #---------------------------------------------------------------------------
+    # IEngineMultiplexer methods
+    #---------------------------------------------------------------------------
+        
+    def execute(self, lines, targets='all'):
+        return self._performOnEnginesAndGatherBoth('execute', lines, targets=targets)
+    
+    def push(self, ns, targets='all'):
+        return self._performOnEnginesAndGatherBoth('push', ns, targets=targets)
+        
+    def pull(self, keys, targets='all'):
+        return self._performOnEnginesAndGatherBoth('pull', keys, targets=targets)
+    
+    def push_function(self, ns, targets='all'):
+        return self._performOnEnginesAndGatherBoth('push_function', ns, targets=targets)
+        
+    def pull_function(self, keys, targets='all'):
+        return self._performOnEnginesAndGatherBoth('pull_function', keys, targets=targets)
+    
+    def get_result(self, i=None, targets='all'):
+        return self._performOnEnginesAndGatherBoth('get_result', i, targets=targets)
+    
+    def reset(self, targets='all'):
+        return self._performOnEnginesAndGatherBoth('reset', targets=targets)
+    
+    def keys(self, targets='all'):
+        return self._performOnEnginesAndGatherBoth('keys', targets=targets)
+    
+    def kill(self, controller=False, targets='all'):
+        if controller:
+            targets = 'all'
+        d = self._performOnEnginesAndGatherBoth('kill', targets=targets)
+        if controller:
+            log.msg("Killing controller")
+            d.addCallback(lambda _: reactor.callLater(2.0, reactor.stop))
+            # Consume any weird stuff coming back
+            d.addBoth(lambda _: None)
+        return d
+    
+    def push_serialized(self, namespace, targets='all'):
+        for k, v in namespace.iteritems():
+            log.msg("Pushed object %s is %f MB" % (k, v.getDataSize()))
+        d = self._performOnEnginesAndGatherBoth('push_serialized', namespace, targets=targets)      
+        return d
+        
+    def pull_serialized(self, keys, targets='all'):
+        try:
+            dList = self._performOnEngines('pull_serialized', keys, targets=targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())
+        else:
+            for d in dList:
+                d.addCallback(self._logSizes)
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'pull_serialized')
+            return d  
+                              
+    def _logSizes(self, listOfSerialized):
+        if isinstance(listOfSerialized, (list, tuple)):
+            for s in listOfSerialized:
+                log.msg("Pulled object is %f MB" % s.getDataSize())
+        else:
+            log.msg("Pulled object is %f MB" % listOfSerialized.getDataSize())
+        return listOfSerialized
+    
+    def clear_queue(self, targets='all'):
+        return self._performOnEnginesAndGatherBoth('clear_queue', targets=targets)         
+    
+    def queue_status(self, targets='all'):
+        log.msg("Getting queue status on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = []
+            for e in engines:
+                dList.append(e.queue_status().addCallback(lambda s:(e.id, s)))
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'queue_status')
+            return d 
+    
+    def get_properties(self, keys=None, targets='all'):
+        log.msg("Getting properties on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = [e.get_properties(keys) for e in engines]
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'get_properties')
+            return d
+    
+    def set_properties(self, properties, targets='all'):
+        log.msg("Setting properties on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = [e.set_properties(properties) for e in engines]
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'set_properties')
+            return d
+    
+    def has_properties(self, keys, targets='all'):
+        log.msg("Checking properties on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = [e.has_properties(keys) for e in engines]
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'has_properties')
+            return d
+    
+    def del_properties(self, keys, targets='all'):
+        log.msg("Deleting properties on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = [e.del_properties(keys) for e in engines]
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'del_properties')
+            return d
+    
+    def clear_properties(self, targets='all'):
+        log.msg("Clearing properties on %r" % targets)
+        try:
+            engines = self.engineList(targets)
+        except (error.InvalidEngineID, AttributeError, error.NoEnginesRegistered):
+            return defer.fail(failure.Failure())            
+        else:
+            dList = [e.clear_properties() for e in engines]
+            d = gatherBoth(dList, 
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            d.addCallback(error.collect_exceptions, 'clear_properties')
+            return d
+
+
+components.registerAdapter(MultiEngine,
+                           IControllerBase, 
+                           IMultiEngine)
+
+
+#-------------------------------------------------------------------------------
+# Interfaces for the Synchronous MultiEngine
+#-------------------------------------------------------------------------------
+
+class ISynchronousEngineMultiplexer(Interface):
+    pass
+
+
+class ISynchronousMultiEngine(ISynchronousEngineMultiplexer):
+    """Synchronous, two-phase version of IMultiEngine.
+    
+    Methods in this interface are identical to those of IMultiEngine, but they
+    take one additional argument:
+    
+    execute(lines, targets='all') -> execute(lines, targets='all, block=True)
+    
+    :Parameters:
+        block : boolean
+            Should the method return a deferred to a deferredID or the 
+            actual result.  If block=False a deferred to a deferredID is 
+            returned and the user must call `get_pending_deferred` at a later
+            point.  If block=True, a deferred to the actual result comes back.
+    """
+    def get_pending_deferred(deferredID, block=True):
+        """"""
+    
+    def clear_pending_deferreds():
+        """"""
+
+
+#-------------------------------------------------------------------------------
+# Implementation of the Synchronous MultiEngine
+#-------------------------------------------------------------------------------
+
+class SynchronousMultiEngine(PendingDeferredManager):
+    """Adapt an `IMultiEngine` -> `ISynchronousMultiEngine`
+    
+    Warning, this class uses a decorator that currently uses **kwargs.  
+    Because of this block must be passed as a kwarg, not positionally.
+    """
+    
+    implements(ISynchronousMultiEngine)
+    
+    def __init__(self, multiengine):
+        self.multiengine = multiengine
+        PendingDeferredManager.__init__(self)
+    
+    #---------------------------------------------------------------------------
+    # Decorated pending deferred methods
+    #---------------------------------------------------------------------------
+    
+    @two_phase
+    def execute(self, lines, targets='all'):
+        d = self.multiengine.execute(lines, targets)
+        return d
+    
+    @two_phase
+    def push(self, namespace, targets='all'):
+        return self.multiengine.push(namespace, targets)
+    
+    @two_phase
+    def pull(self, keys, targets='all'):
+        d = self.multiengine.pull(keys, targets)
+        return d
+    
+    @two_phase
+    def push_function(self, namespace, targets='all'):
+        return self.multiengine.push_function(namespace, targets)
+    
+    @two_phase
+    def pull_function(self, keys, targets='all'):
+        d = self.multiengine.pull_function(keys, targets)
+        return d
+    
+    @two_phase
+    def get_result(self, i=None, targets='all'):
+        return self.multiengine.get_result(i, targets='all')
+    
+    @two_phase
+    def reset(self, targets='all'):
+        return self.multiengine.reset(targets)
+    
+    @two_phase
+    def keys(self, targets='all'):
+        return self.multiengine.keys(targets)
+    
+    @two_phase
+    def kill(self, controller=False, targets='all'):
+        return self.multiengine.kill(controller, targets)
+    
+    @two_phase
+    def push_serialized(self, namespace, targets='all'):
+        return self.multiengine.push_serialized(namespace, targets)
+    
+    @two_phase
+    def pull_serialized(self, keys, targets='all'):
+        return self.multiengine.pull_serialized(keys, targets)
+    
+    @two_phase
+    def clear_queue(self, targets='all'):
+        return self.multiengine.clear_queue(targets)
+    
+    @two_phase
+    def queue_status(self, targets='all'):
+        return self.multiengine.queue_status(targets)
+    
+    @two_phase
+    def set_properties(self, properties, targets='all'):
+        return self.multiengine.set_properties(properties, targets)
+    
+    @two_phase
+    def get_properties(self, keys=None, targets='all'):
+        return self.multiengine.get_properties(keys, targets)
+    
+    @two_phase
+    def has_properties(self, keys, targets='all'):
+        return self.multiengine.has_properties(keys, targets)
+    
+    @two_phase
+    def del_properties(self, keys, targets='all'):
+        return self.multiengine.del_properties(keys, targets)
+    
+    @two_phase
+    def clear_properties(self, targets='all'):
+        return self.multiengine.clear_properties(targets)
+    
+    #---------------------------------------------------------------------------
+    # IMultiEngine methods
+    #---------------------------------------------------------------------------
+    
+    def get_ids(self):
+        """Return a list of registered engine ids.
+        
+        Never use the two phase block/non-block stuff for this.
+        """
+        return self.multiengine.get_ids()
+
+
+components.registerAdapter(SynchronousMultiEngine, IMultiEngine, ISynchronousMultiEngine)
+
+
+#-------------------------------------------------------------------------------
+# Various high-level interfaces that can be used as MultiEngine mix-ins
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# IMultiEngineCoordinator
+#-------------------------------------------------------------------------------
+
+class IMultiEngineCoordinator(Interface):
+    """Methods that work on multiple engines explicitly."""
+       
+    def scatter(key, seq, style='basic', flatten=False, targets='all'):
+        """Partition and distribute a sequence to targets.
+        
+        :Parameters:
+            key : str
+                The variable name to call the scattered sequence.
+            seq : list, tuple, array
+                The sequence to scatter.  The type should be preserved.
+            style : string
+                A specification of how the sequence is partitioned.  Currently 
+                only 'basic' is implemented.
+            flatten : boolean
+                Should single element sequences be converted to scalars.
+        """
+        
+    def gather(key, style='basic', targets='all'):
+        """Gather object key from targets.
+    
+        :Parameters:
+            key : string
+                The name of a sequence on the targets to gather.
+            style : string
+                A specification of how the sequence is partitioned.  Currently 
+                only 'basic' is implemented.                
+        """
+    
+    def map(func, seq, style='basic', targets='all'):
+        """A parallelized version of Python's builtin map.
+        
+        This function implements the following pattern:
+        
+        1. The sequence seq is scattered to the given targets.
+        2. map(functionSource, seq) is called on each engine.
+        3. The resulting sequences are gathered back to the local machine.
+                
+        :Parameters:
+            targets : int, list or 'all'
+                The engine ids the action will apply to.  Call `get_ids` to see
+                a list of currently available engines.
+            func : str, function
+                An actual function object or a Python string that names a 
+                callable defined on the engines.
+            seq : list, tuple or numpy array
+                The local sequence to be scattered.
+            style : str
+                Only 'basic' is supported for now.
+                
+        :Returns: A list of len(seq) with functionSource called on each element
+        of seq.
+                
+        Example
+        =======
+        
+        >>> rc.mapAll('lambda x: x*x', range(10000))
+        [0,2,4,9,25,36,...]
+        """
+
+
+class ISynchronousMultiEngineCoordinator(IMultiEngineCoordinator):
+    """Methods that work on multiple engines explicitly."""
+    pass
+
+
+#-------------------------------------------------------------------------------
+# IMultiEngineExtras
+#-------------------------------------------------------------------------------
+
+class IMultiEngineExtras(Interface):
+    
+    def zip_pull(targets, *keys):
+        """Pull, but return results in a different format from `pull`.
+        
+        This method basically returns zip(pull(targets, *keys)), with a few 
+        edge cases handled differently.  Users of chainsaw will find this format 
+        familiar.
+        
+        :Parameters:
+            targets : int, list or 'all'
+                The engine ids the action will apply to.  Call `get_ids` to see
+                a list of currently available engines.
+            keys: list or tuple of str
+                A list of variable names as string of the Python objects to be pulled
+                back to the client.
+        
+        :Returns: A list of pulled Python objects for each target.
+        """
+    
+    def run(targets, fname):
+        """Run a .py file on targets.
+        
+        :Parameters:
+            targets : int, list or 'all'
+                The engine ids the action will apply to.  Call `get_ids` to see
+                a list of currently available engines.
+            fname : str
+                The filename of a .py file on the local system to be sent to and run
+                on the engines.
+            block : boolean
+                Should I block or not.  If block=True, wait for the action to
+                complete and return the result.  If block=False, return a
+                `PendingResult` object that can be used to later get the
+                result.  If block is not specified, the block attribute 
+                will be used instead. 
+        """
+
+
+class ISynchronousMultiEngineExtras(IMultiEngineExtras):
+    pass
+
+
+#-------------------------------------------------------------------------------
+# The full MultiEngine interface
+#-------------------------------------------------------------------------------
+
+class IFullMultiEngine(IMultiEngine, 
+    IMultiEngineCoordinator, 
+    IMultiEngineExtras):
+    pass
+
+
+class IFullSynchronousMultiEngine(ISynchronousMultiEngine, 
+    ISynchronousMultiEngineCoordinator,
+    ISynchronousMultiEngineExtras):
+    pass
+
diff --git a/IPython/kernel/multiengineclient.py b/IPython/kernel/multiengineclient.py
new file mode 100644
index 0000000..1200f2a
--- /dev/null
+++ b/IPython/kernel/multiengineclient.py
@@ -0,0 +1,840 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_multiengineclient -*-
+
+"""General Classes for IMultiEngine clients."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import sys
+import cPickle as pickle
+from types import FunctionType
+import linecache
+
+from twisted.internet import reactor
+from twisted.python import components, log
+from twisted.python.failure import Failure
+from zope.interface import Interface, implements, Attribute
+
+from IPython.ColorANSI import TermColors
+
+from IPython.kernel.twistedutil import blockingCallFromThread
+from IPython.kernel import error
+from IPython.kernel.parallelfunction import ParallelFunction
+from IPython.kernel import map as Map
+from IPython.kernel import multiengine as me
+from IPython.kernel.multiengine import (IFullMultiEngine,
+    IFullSynchronousMultiEngine)
+
+
+#-------------------------------------------------------------------------------
+# Pending Result things
+#-------------------------------------------------------------------------------
+
+class IPendingResult(Interface):
+    """A representation of a result that is pending.
+    
+    This class is similar to Twisted's `Deferred` object, but is designed to be
+    used in a synchronous context.
+    """
+    
+    result_id=Attribute("ID of the deferred on the other side")
+    client=Attribute("A client that I came from")
+    r=Attribute("An attribute that is a property that calls and returns get_result")
+    
+    def get_result(default=None, block=True):
+        """
+        Get a result that is pending.
+                
+        :Parameters:
+            default
+                The value to return if the result is not ready.
+            block : boolean
+                Should I block for the result.
+                
+        :Returns: The actual result or the default value.
+        """
+        
+    def add_callback(f, *args, **kwargs):
+        """
+        Add a callback that is called with the result.
+        
+        If the original result is foo, adding a callback will cause
+        f(foo, *args, **kwargs) to be returned instead.  If multiple
+        callbacks are registered, they are chained together: the result of
+        one is passed to the next and so on.  
+        
+        Unlike Twisted's Deferred object, there is no errback chain.  Thus
+        any exception raised will not be caught and handled.  User must 
+        catch these by hand when calling `get_result`.
+        """
+
+
+class PendingResult(object):
+    """A representation of a result that is not yet ready.
+    
+    A user should not create a `PendingResult` instance by hand.
+    
+    Methods
+    =======
+    
+    * `get_result`
+    * `add_callback`
+    
+    Properties
+    ==========
+    * `r`
+    """
+    
+    def __init__(self, client, result_id):
+        """Create a PendingResult with a result_id and a client instance.
+        
+        The client should implement `_getPendingResult(result_id, block)`.
+        """
+        self.client = client
+        self.result_id = result_id
+        self.called = False
+        self.raised = False
+        self.callbacks = []
+        
+    def get_result(self, default=None, block=True):
+        """Get a result that is pending.
+                
+        This method will connect to an IMultiEngine adapted controller
+        and see if the result is ready.  If the action triggers an exception
+        raise it and record it.  This method records the result/exception once it is 
+        retrieved.  Calling `get_result` again will get this cached result or will
+        re-raise the exception.  The .r attribute is a property that calls
+        `get_result` with block=True.
+        
+        :Parameters:
+            default
+                The value to return if the result is not ready.
+            block : boolean
+                Should I block for the result.
+                
+        :Returns: The actual result or the default value.
+        """
+        
+        if self.called:
+            if self.raised:
+                raise self.result[0], self.result[1], self.result[2]
+            else:
+                return self.result
+        try:
+            result = self.client.get_pending_deferred(self.result_id, block)
+        except error.ResultNotCompleted:
+            return default
+        except:
+            # Reraise other error, but first record them so they can be reraised
+            # later if .r or get_result is called again.
+            self.result = sys.exc_info()
+            self.called = True
+            self.raised = True
+            raise
+        else:
+            for cb in self.callbacks:
+                result = cb[0](result, *cb[1], **cb[2])
+            self.result = result
+            self.called = True
+            return result
+        
+    def add_callback(self, f, *args, **kwargs):
+        """Add a callback that is called with the result.
+        
+        If the original result is result, adding a callback will cause
+        f(result, *args, **kwargs) to be returned instead.  If multiple
+        callbacks are registered, they are chained together: the result of
+        one is passed to the next and so on.  
+        
+        Unlike Twisted's Deferred object, there is no errback chain.  Thus
+        any exception raised will not be caught and handled.  User must 
+        catch these by hand when calling `get_result`.
+        """
+        assert callable(f)
+        self.callbacks.append((f, args, kwargs))
+        
+    def __cmp__(self, other):
+        if self.result_id < other.result_id:
+            return -1
+        else:
+            return 1
+            
+    def _get_r(self):
+        return self.get_result(block=True)
+    
+    r = property(_get_r)
+    """This property is a shortcut to a `get_result(block=True)`."""
+
+
+#-------------------------------------------------------------------------------
+# Pretty printing wrappers for certain lists
+#-------------------------------------------------------------------------------    
+    
+class ResultList(list):
+    """A subclass of list that pretty prints the output of `execute`/`get_result`."""
+    
+    def __repr__(self):
+        output = []
+        blue = TermColors.Blue
+        normal = TermColors.Normal
+        red = TermColors.Red
+        green = TermColors.Green
+        output.append("<Results List>\n")
+        for cmd in self:
+            if isinstance(cmd, Failure):
+                output.append(cmd)
+            else:
+                target = cmd.get('id',None)
+                cmd_num = cmd.get('number',None)
+                cmd_stdin = cmd.get('input',{}).get('translated','No Input')
+                cmd_stdout = cmd.get('stdout', None)
+                cmd_stderr = cmd.get('stderr', None)
+                output.append("%s[%i]%s In [%i]:%s %s\n" % \
+                    (green, target,
+                    blue, cmd_num, normal, cmd_stdin))
+                if cmd_stdout:
+                    output.append("%s[%i]%s Out[%i]:%s %s\n" % \
+                        (green, target,
+                        red, cmd_num, normal, cmd_stdout))
+                if cmd_stderr:
+                    output.append("%s[%i]%s Err[%i]:\n%s %s" % \
+                        (green, target,
+                        red, cmd_num, normal, cmd_stderr))
+        return ''.join(output)
+
+
+def wrapResultList(result):
+    """A function that wraps the output of `execute`/`get_result` -> `ResultList`."""
+    if len(result) == 0:
+        result = [result]
+    return ResultList(result)
+
+
+class QueueStatusList(list):
+    """A subclass of list that pretty prints the output of `queue_status`."""
+    
+    def __repr__(self):
+        output = []
+        output.append("<Queue Status List>\n")
+        for e in self:
+            output.append("Engine: %s\n" % repr(e[0]))
+            output.append("    Pending: %s\n" % repr(e[1]['pending']))
+            for q in e[1]['queue']:
+                output.append("    Command: %s\n" % repr(q))
+        return ''.join(output)
+
+
+#-------------------------------------------------------------------------------
+# InteractiveMultiEngineClient
+#-------------------------------------------------------------------------------    
+
+class InteractiveMultiEngineClient(object):
+    """A mixin class that add a few methods to a multiengine client.
+    
+    The methods in this mixin class are designed for interactive usage.
+    """
+                                        
+    def activate(self):
+        """Make this `MultiEngineClient` active for parallel magic commands.
+        
+        IPython has a magic command syntax to work with `MultiEngineClient` objects.
+        In a given IPython session there is a single active one.  While
+        there can be many `MultiEngineClient` created and used by the user, 
+        there is only one active one.  The active `MultiEngineClient` is used whenever 
+        the magic commands %px and %autopx are used.
+        
+        The activate() method is called on a given `MultiEngineClient` to make it 
+        active.  Once this has been done, the magic commands can be used.
+        """
+        
+        try:
+            __IPYTHON__.activeController = self
+        except NameError:
+            print "The IPython Controller magics only work within IPython."
+                    
+    def __setitem__(self, key, value):
+        """Add a dictionary interface for pushing/pulling.
+        
+        This functions as a shorthand for `push`.
+        
+        :Parameters:
+            key : str 
+                What to call the remote object.
+            value : object
+                The local Python object to push.
+        """
+        targets, block = self._findTargetsAndBlock()
+        return self.push({key:value}, targets=targets, block=block)
+    
+    def __getitem__(self, key):
+        """Add a dictionary interface for pushing/pulling.
+        
+        This functions as a shorthand to `pull`.
+        
+        :Parameters:
+         - `key`: A string representing the key.
+        """
+        if isinstance(key, str):
+            targets, block = self._findTargetsAndBlock()
+            return self.pull(key, targets=targets, block=block)
+        else:
+            raise TypeError("__getitem__ only takes strs")
+            
+    def __len__(self):
+        """Return the number of available engines."""
+        return len(self.get_ids())
+        
+    def parallelize(self, func, targets=None, block=None):
+        """Build a `ParallelFunction` object for functionName on engines.
+        
+        The returned object will implement a parallel version of functionName
+        that takes a local sequence as its only argument and calls (in 
+        parallel) functionName on each element of that sequence.  The
+        `ParallelFunction` object has a `targets` attribute that controls
+        which engines the function is run on.
+        
+        :Parameters:
+            targets : int, list or 'all'
+                The engine ids the action will apply to.  Call `get_ids` to see
+                a list of currently available engines.
+            functionName : str
+                A Python string that names a callable defined on the engines.
+        
+        :Returns:  A `ParallelFunction` object.                
+        
+        Examples
+        ========
+        
+        >>> psin = rc.parallelize('all','lambda x:sin(x)')
+        >>> psin(range(10000))
+        [0,2,4,9,25,36,...]
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return ParallelFunction(func, self, targets, block)
+
+    #---------------------------------------------------------------------------
+    # Make this a context manager for with
+    #---------------------------------------------------------------------------
+    
+    def findsource_file(self,f):
+        linecache.checkcache()
+        s = findsource(f.f_code)
+        lnum = f.f_lineno
+        wsource = s[0][f.f_lineno:]
+        return strip_whitespace(wsource)
+
+    def findsource_ipython(self,f):
+        from IPython import ipapi
+        self.ip = ipapi.get()
+        wsource = [l+'\n' for l in
+                   self.ip.IP.input_hist_raw[-1].splitlines()[1:]] 
+        return strip_whitespace(wsource)
+        
+    def __enter__(self):
+        f = sys._getframe(1)
+        local_ns = f.f_locals
+        global_ns = f.f_globals
+        if f.f_code.co_filename == '<ipython console>':
+            s = self.findsource_ipython(f)
+        else:
+            s = self.findsource_file(f)
+
+        self._with_context_result = self.execute(s)
+
+    def __exit__ (self, etype, value, tb):
+        if issubclass(etype,error.StopLocalExecution):
+            return True
+
+
+def remote():
+    m = 'Special exception to stop local execution of parallel code.'
+    raise error.StopLocalExecution(m)
+
+def strip_whitespace(source):
+    # Expand tabs to avoid any confusion.
+    wsource = [l.expandtabs(4) for l in source]
+    # Detect the indentation level
+    done = False
+    for line in wsource:
+        if line.isspace():
+            continue
+        for col,char in enumerate(line):
+            if char != ' ':
+                done = True
+                break
+        if done:
+            break
+    # Now we know how much leading space there is in the code.  Next, we
+    # extract up to the first line that has less indentation.
+    # WARNINGS: we skip comments that may be misindented, but we do NOT yet
+    # detect triple quoted strings that may have flush left text.
+    for lno,line in enumerate(wsource):
+        lead = line[:col]
+        if lead.isspace():
+            continue
+        else:
+            if not lead.lstrip().startswith('#'):
+                break
+    # The real 'with' source is up to lno
+    src_lines = [l[col:] for l in wsource[:lno+1]]
+
+    # Finally, check that the source's first non-comment line begins with the
+    # special call 'remote()'
+    for nline,line in enumerate(src_lines):
+        if line.isspace() or line.startswith('#'):
+            continue
+        if 'remote()' in line:
+            break
+        else:
+            raise ValueError('remote() call missing at the start of code')
+    src = ''.join(src_lines[nline+1:])
+    #print 'SRC:\n<<<<<<<>>>>>>>\n%s<<<<<>>>>>>' % src  # dbg
+    return src
+
+
+#-------------------------------------------------------------------------------
+# The top-level MultiEngine client adaptor
+#-------------------------------------------------------------------------------
+
+
+class IFullBlockingMultiEngineClient(Interface):
+    pass
+
+
+class FullBlockingMultiEngineClient(InteractiveMultiEngineClient):
+    """
+    A blocking client to the `IMultiEngine` controller interface.
+    
+    This class allows users to use a set of engines for a parallel
+    computation through the `IMultiEngine` interface.  In this interface,
+    each engine has a specific id (an int) that is used to refer to the
+    engine, run code on it, etc.
+    """
+    
+    implements(IFullBlockingMultiEngineClient)
+    
+    def __init__(self, smultiengine):
+        self.smultiengine = smultiengine
+        self.block = True
+        self.targets = 'all'
+    
+    def _findBlock(self, block=None):
+        if block is None:
+            return self.block
+        else:
+            if block in (True, False):
+                return block
+            else:
+                raise ValueError("block must be True or False")
+    
+    def _findTargets(self, targets=None):
+        if targets is None:
+            return self.targets
+        else:
+            if not isinstance(targets, (str,list,tuple,int)):
+                raise ValueError("targets must be a str, list, tuple or int")
+            return targets
+    
+    def _findTargetsAndBlock(self, targets=None, block=None):
+        return self._findTargets(targets), self._findBlock(block) 
+    
+    def _blockFromThread(self, function, *args, **kwargs):
+        block = kwargs.get('block', None)
+        if block is None:
+            raise error.MissingBlockArgument("'block' keyword argument is missing")
+        result = blockingCallFromThread(function, *args, **kwargs)
+        if not block:
+            result = PendingResult(self, result)
+        return result
+    
+    def get_pending_deferred(self, deferredID, block):
+        return blockingCallFromThread(self.smultiengine.get_pending_deferred, deferredID, block)
+    
+    def barrier(self, pendingResults):
+        """Synchronize a set of `PendingResults`.
+        
+        This method is a synchronization primitive that waits for a set of
+        `PendingResult` objects to complete.  More specifically, barier does
+        the following.
+        
+        * The `PendingResult`s are sorted by result_id.
+        * The `get_result` method is called for each `PendingResult` sequentially
+          with block=True.
+        * If a `PendingResult` gets a result that is an exception, it is 
+          trapped and can be re-raised later by calling `get_result` again.
+        * The `PendingResult`s are flushed from the controller.
+                
+        After barrier has been called on a `PendingResult`, its results can 
+        be retrieved by calling `get_result` again or accesing the `r` attribute
+        of the instance.
+        """
+        
+        # Convert to list for sorting and check class type 
+        prList = list(pendingResults)
+        for pr in prList:
+            if not isinstance(pr, PendingResult):
+                raise error.NotAPendingResult("Objects passed to barrier must be PendingResult instances")
+                            
+        # Sort the PendingResults so they are in order
+        prList.sort()
+        # Block on each PendingResult object
+        for pr in prList:
+            try:
+                result = pr.get_result(block=True)
+            except Exception:
+                pass
+    
+    def flush(self):
+        """
+        Clear all pending deferreds/results from the controller.
+        
+        For each `PendingResult` that is created by this client, the controller
+        holds on to the result for that `PendingResult`.  This can be a problem
+        if there are a large number of `PendingResult` objects that are created.
+        
+        Once the result of the `PendingResult` has been retrieved, the result
+        is removed from the controller, but if a user doesn't get a result (
+        they just ignore the `PendingResult`) the result is kept forever on the
+        controller.  This method allows the user to clear out all un-retrieved
+        results on the controller. 
+        """
+        r = blockingCallFromThread(self.smultiengine.clear_pending_deferreds)
+        return r
+    
+    clear_pending_results = flush
+    
+    #---------------------------------------------------------------------------
+    # IEngineMultiplexer related methods
+    #---------------------------------------------------------------------------
+    
+    def execute(self, lines, targets=None, block=None):
+        """
+        Execute code on a set of engines.
+        
+        :Parameters:
+            lines : str
+                The Python code to execute as a string
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        result = blockingCallFromThread(self.smultiengine.execute, lines,
+            targets=targets, block=block)
+        if block:
+            result = ResultList(result)
+        else:
+            result = PendingResult(self, result)
+            result.add_callback(wrapResultList)
+        return result
+    
+    def push(self, namespace, targets=None, block=None):
+        """
+        Push a dictionary of keys and values to engines namespace.
+        
+        Each engine has a persistent namespace.  This method is used to push
+        Python objects into that namespace.
+        
+        The objects in the namespace must be pickleable.
+        
+        :Parameters:
+            namespace : dict
+                A dict that contains Python objects to be injected into
+                the engine persistent namespace.
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.push, namespace,
+            targets=targets, block=block)
+    
+    def pull(self, keys, targets=None, block=None):
+        """
+        Pull Python objects by key out of engines namespaces.
+        
+        :Parameters:
+            keys : str or list of str
+                The names of the variables to be pulled
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.pull, keys, targets=targets, block=block)
+    
+    def push_function(self, namespace, targets=None, block=None):
+        """
+        Push a Python function to an engine.
+        
+        This method is used to push a Python function to an engine.  This
+        method can then be used in code on the engines.  Closures are not supported.
+        
+        :Parameters:
+            namespace : dict
+                A dict whose values are the functions to be pushed.  The keys give
+                that names that the function will appear as in the engines
+                namespace.
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.push_function, namespace, targets=targets, block=block)
+    
+    def pull_function(self, keys, targets=None, block=None):
+        """
+        Pull a Python function from an engine.
+        
+        This method is used to pull a Python function from an engine.
+        Closures are not supported.
+        
+        :Parameters:
+            keys : str or list of str
+                The names of the functions to be pulled
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.pull_function, keys, targets=targets, block=block)
+    
+    def push_serialized(self, namespace, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.push_serialized, namespace, targets=targets, block=block)
+    
+    def pull_serialized(self, keys, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.pull_serialized, keys, targets=targets, block=block)
+    
+    def get_result(self, i=None, targets=None, block=None):
+        """
+        Get a previous result.
+        
+        When code is executed in an engine, a dict is created and returned.  This
+        method retrieves that dict for previous commands.
+        
+        :Parameters:
+            i : int
+                The number of the result to get
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        result = blockingCallFromThread(self.smultiengine.get_result, i, targets=targets, block=block)
+        if block:
+            result = ResultList(result)
+        else:
+            result = PendingResult(self, result)
+            result.add_callback(wrapResultList)
+        return result
+    
+    def reset(self, targets=None, block=None):
+        """
+        Reset an engine.
+        
+        This method clears out the namespace of an engine.
+
+        :Parameters:
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.reset, targets=targets, block=block)
+    
+    def keys(self, targets=None, block=None):
+        """
+        Get a list of all the variables in an engine's namespace.
+
+        :Parameters:
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.keys, targets=targets, block=block)
+    
+    def kill(self, controller=False, targets=None, block=None):
+        """
+        Kill the engines and controller.
+        
+        This method is used to stop the engine and controller by calling
+        `reactor.stop`.
+        
+        :Parameters:
+            controller : boolean
+                If True, kill the engines and controller.  If False, just the 
+                engines
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.kill, controller, targets=targets, block=block)
+    
+    def clear_queue(self, targets=None, block=None):
+        """
+        Clear out the controller's queue for an engine.
+        
+        The controller maintains a queue for each engine.  This clear it out.
+        
+        :Parameters:
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.clear_queue, targets=targets, block=block)
+    
+    def queue_status(self, targets=None, block=None):
+        """
+        Get the status of an engines queue.
+        
+        :Parameters:
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.queue_status, targets=targets, block=block)
+    
+    def set_properties(self, properties, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.set_properties, properties, targets=targets, block=block)
+    
+    def get_properties(self, keys=None, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.get_properties, keys, targets=targets, block=block)
+    
+    def has_properties(self, keys, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.has_properties, keys, targets=targets, block=block)
+    
+    def del_properties(self, keys, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.del_properties, keys, targets=targets, block=block)
+    
+    def clear_properties(self, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.clear_properties, targets=targets, block=block)
+    
+    #---------------------------------------------------------------------------
+    # IMultiEngine related methods
+    #---------------------------------------------------------------------------
+    
+    def get_ids(self):
+        """
+        Returns the ids of currently registered engines.
+        """
+        result = blockingCallFromThread(self.smultiengine.get_ids)
+        return result
+        
+    #---------------------------------------------------------------------------
+    # IMultiEngineCoordinator
+    #---------------------------------------------------------------------------
+             
+    def scatter(self, key, seq, style='basic', flatten=False, targets=None, block=None):
+        """
+        Partition a Python sequence and send the partitions to a set of engines.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.scatter, key, seq, 
+            style, flatten, targets=targets, block=block)
+    
+    def gather(self, key, style='basic', targets=None, block=None):
+        """
+        Gather a partitioned sequence on a set of engines as a single local seq.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.gather, key, style, 
+            targets=targets, block=block)
+    
+    def map(self, func, seq, style='basic', targets=None, block=None):
+        """
+        A parallelized version of Python's builtin map
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.map, func, seq, 
+            style, targets=targets, block=block)
+    
+    #---------------------------------------------------------------------------
+    # IMultiEngineExtras
+    #---------------------------------------------------------------------------
+    
+    def zip_pull(self, keys, targets=None, block=None):
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.zip_pull, keys, 
+            targets=targets, block=block)
+    
+    def run(self, filename, targets=None, block=None):
+        """
+        Run a Python code in a file on the engines.
+        
+        :Parameters:
+            filename : str
+                The name of the local file to run
+            targets : id or list of ids
+                The engine to use for the execution
+            block : boolean
+                If False, this method will return the actual result.  If False,
+                a `PendingResult` is returned which can be used to get the result
+                at a later time.
+        """
+        targets, block = self._findTargetsAndBlock(targets, block)
+        return self._blockFromThread(self.smultiengine.run, filename,
+            targets=targets, block=block)
+
+
+
+components.registerAdapter(FullBlockingMultiEngineClient,
+            IFullSynchronousMultiEngine, IFullBlockingMultiEngineClient)
+
+
+
+
diff --git a/IPython/kernel/multienginefc.py b/IPython/kernel/multienginefc.py
new file mode 100644
index 0000000..df53f22
--- /dev/null
+++ b/IPython/kernel/multienginefc.py
@@ -0,0 +1,668 @@
+# encoding: utf-8
+
+"""
+Expose the multiengine controller over the Foolscap network protocol.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import cPickle as pickle
+from types import FunctionType
+
+from zope.interface import Interface, implements
+from twisted.internet import defer
+from twisted.python import components, failure, log
+
+from foolscap import Referenceable
+
+from IPython.kernel import error 
+from IPython.kernel.util import printer
+from IPython.kernel import map as Map
+from IPython.kernel.twistedutil import gatherBoth
+from IPython.kernel.multiengine import (MultiEngine,
+    IMultiEngine,
+    IFullSynchronousMultiEngine,
+    ISynchronousMultiEngine)
+from IPython.kernel.multiengineclient import wrapResultList
+from IPython.kernel.pendingdeferred import PendingDeferredManager
+from IPython.kernel.pickleutil import (can, canDict,
+    canSequence, uncan, uncanDict, uncanSequence)
+
+from IPython.kernel.clientinterfaces import (
+    IFCClientInterfaceProvider, 
+    IBlockingClientAdaptor
+)
+
+# Needed to access the true globals from __main__.__dict__ 
+import __main__
+
+#-------------------------------------------------------------------------------
+# The Controller side of things
+#-------------------------------------------------------------------------------
+
+def packageResult(wrappedMethod):
+    
+    def wrappedPackageResult(self, *args, **kwargs):
+        d = wrappedMethod(self, *args, **kwargs)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d
+    return wrappedPackageResult
+
+
+class IFCSynchronousMultiEngine(Interface):
+    """Foolscap interface to `ISynchronousMultiEngine`.  
+    
+    The methods in this interface are similar to those of 
+    `ISynchronousMultiEngine`, but their arguments and return values are pickled
+    if they are not already simple Python types that can be send over XML-RPC.
+    
+    See the documentation of `ISynchronousMultiEngine` and `IMultiEngine` for 
+    documentation about the methods.
+    
+    Most methods in this interface act like the `ISynchronousMultiEngine`
+    versions and can be called in blocking or non-blocking mode.
+    """
+    pass
+
+
+class FCSynchronousMultiEngineFromMultiEngine(Referenceable):
+    """Adapt `IMultiEngine` -> `ISynchronousMultiEngine` -> `IFCSynchronousMultiEngine`.
+    """
+    
+    implements(IFCSynchronousMultiEngine, IFCClientInterfaceProvider)
+    
+    addSlash = True
+    
+    def __init__(self, multiengine):
+        # Adapt the raw multiengine to `ISynchronousMultiEngine` before saving
+        # it.  This allow this class to do two adaptation steps.
+        self.smultiengine = ISynchronousMultiEngine(multiengine)
+        self._deferredIDCallbacks = {}
+    
+    #---------------------------------------------------------------------------
+    # Non interface methods
+    #---------------------------------------------------------------------------
+    
+    def packageFailure(self, f):
+        f.cleanFailure()
+        return self.packageSuccess(f)
+    
+    def packageSuccess(self, obj):
+        serial = pickle.dumps(obj, 2)
+        return serial
+    
+    #---------------------------------------------------------------------------
+    # Things related to PendingDeferredManager
+    #---------------------------------------------------------------------------
+    
+    @packageResult
+    def remote_get_pending_deferred(self, deferredID, block):
+        d = self.smultiengine.get_pending_deferred(deferredID, block)
+        try:
+            callback = self._deferredIDCallbacks.pop(deferredID)
+        except KeyError:
+            callback = None
+        if callback is not None:
+            d.addCallback(callback[0], *callback[1], **callback[2])
+        return d
+       
+    @packageResult
+    def remote_clear_pending_deferreds(self):
+        return defer.maybeDeferred(self.smultiengine.clear_pending_deferreds)
+    
+    def _addDeferredIDCallback(self, did, callback, *args, **kwargs):
+        self._deferredIDCallbacks[did] = (callback, args, kwargs)
+        return did
+        
+    #---------------------------------------------------------------------------
+    # IEngineMultiplexer related methods
+    #---------------------------------------------------------------------------
+    
+    @packageResult
+    def remote_execute(self, lines, targets, block):
+        return self.smultiengine.execute(lines, targets=targets, block=block)
+    
+    @packageResult    
+    def remote_push(self, binaryNS, targets, block):
+        try:
+            namespace = pickle.loads(binaryNS)
+        except:
+            d = defer.fail(failure.Failure())
+        else:
+            d = self.smultiengine.push(namespace, targets=targets, block=block)
+        return d
+    
+    @packageResult
+    def remote_pull(self, keys, targets, block):
+        d = self.smultiengine.pull(keys, targets=targets, block=block)
+        return d
+    
+    @packageResult    
+    def remote_push_function(self, binaryNS, targets, block):
+        try:
+            namespace = pickle.loads(binaryNS)
+        except:
+            d = defer.fail(failure.Failure())
+        else:
+            namespace = uncanDict(namespace)
+            d = self.smultiengine.push_function(namespace, targets=targets, block=block)
+        return d
+    
+    def _canMultipleKeys(self, result):
+        return [canSequence(r) for r in result]
+    
+    @packageResult
+    def remote_pull_function(self, keys, targets, block):
+        def can_functions(r, keys):
+            if len(keys)==1 or isinstance(keys, str):
+                result = canSequence(r)
+            elif len(keys)>1:
+                result = [canSequence(s) for s in r]
+            return result
+        d = self.smultiengine.pull_function(keys, targets=targets, block=block)
+        if block:
+            d.addCallback(can_functions, keys)
+        else:
+            d.addCallback(lambda did: self._addDeferredIDCallback(did, can_functions, keys))
+        return d
+    
+    @packageResult    
+    def remote_push_serialized(self, binaryNS, targets, block):
+        try:
+            namespace = pickle.loads(binaryNS)
+        except:
+            d = defer.fail(failure.Failure())
+        else:
+            d = self.smultiengine.push_serialized(namespace, targets=targets, block=block)
+        return d
+    
+    @packageResult
+    def remote_pull_serialized(self, keys, targets, block):
+        d = self.smultiengine.pull_serialized(keys, targets=targets, block=block)
+        return d
+    
+    @packageResult
+    def remote_get_result(self, i, targets, block):
+        if i == 'None':
+            i = None
+        return self.smultiengine.get_result(i, targets=targets, block=block)
+    
+    @packageResult
+    def remote_reset(self, targets, block):
+        return self.smultiengine.reset(targets=targets, block=block)
+    
+    @packageResult
+    def remote_keys(self, targets, block):
+        return self.smultiengine.keys(targets=targets, block=block)
+    
+    @packageResult
+    def remote_kill(self, controller, targets, block):
+        return self.smultiengine.kill(controller, targets=targets, block=block)
+    
+    @packageResult
+    def remote_clear_queue(self, targets, block):
+        return self.smultiengine.clear_queue(targets=targets, block=block)
+    
+    @packageResult
+    def remote_queue_status(self, targets, block):
+        return self.smultiengine.queue_status(targets=targets, block=block)
+    
+    @packageResult
+    def remote_set_properties(self, binaryNS, targets, block):
+        try:
+            ns = pickle.loads(binaryNS)
+        except:
+            d = defer.fail(failure.Failure())
+        else:
+            d = self.smultiengine.set_properties(ns, targets=targets, block=block)
+        return d
+    
+    @packageResult
+    def remote_get_properties(self, keys, targets, block):
+        if keys=='None':
+            keys=None
+        return self.smultiengine.get_properties(keys, targets=targets, block=block)
+    
+    @packageResult
+    def remote_has_properties(self, keys, targets, block):
+        return self.smultiengine.has_properties(keys, targets=targets, block=block)
+    
+    @packageResult
+    def remote_del_properties(self, keys, targets, block):
+        return self.smultiengine.del_properties(keys, targets=targets, block=block)
+    
+    @packageResult
+    def remote_clear_properties(self, targets, block):
+        return self.smultiengine.clear_properties(targets=targets, block=block)
+    
+    #---------------------------------------------------------------------------
+    # IMultiEngine related methods
+    #---------------------------------------------------------------------------
+    
+    def remote_get_ids(self):
+        """Get the ids of the registered engines.
+        
+        This method always blocks.
+        """
+        return self.smultiengine.get_ids()
+    
+    #---------------------------------------------------------------------------
+    # IFCClientInterfaceProvider related methods
+    #---------------------------------------------------------------------------
+    
+    def remote_get_client_name(self):
+        return 'IPython.kernel.multienginefc.FCFullSynchronousMultiEngineClient'
+
+
+# The __init__ method of `FCMultiEngineFromMultiEngine` first adapts the
+# `IMultiEngine` to `ISynchronousMultiEngine` so this is actually doing a
+# two phase adaptation.
+components.registerAdapter(FCSynchronousMultiEngineFromMultiEngine,
+            IMultiEngine, IFCSynchronousMultiEngine)
+
+
+#-------------------------------------------------------------------------------
+# The Client side of things
+#-------------------------------------------------------------------------------
+
+
+class FCFullSynchronousMultiEngineClient(object):
+    
+    implements(IFullSynchronousMultiEngine, IBlockingClientAdaptor)
+    
+    def __init__(self, remote_reference):
+        self.remote_reference = remote_reference
+        self._deferredIDCallbacks = {}
+        # This class manages some pending deferreds through this instance.  This
+        # is required for methods like gather/scatter as it enables us to
+        # create our own pending deferreds for composite operations.
+        self.pdm = PendingDeferredManager()
+    
+    #---------------------------------------------------------------------------
+    # Non interface methods
+    #---------------------------------------------------------------------------
+                 
+    def unpackage(self, r):
+        return pickle.loads(r)
+    
+    #---------------------------------------------------------------------------
+    # Things related to PendingDeferredManager
+    #---------------------------------------------------------------------------
+    
+    def get_pending_deferred(self, deferredID, block=True):
+        
+        # Because we are managing some pending deferreds locally (through
+        # self.pdm) and some remotely (on the controller), we first try the 
+        # local one and then the remote one.
+        if self.pdm.quick_has_id(deferredID):
+            d = self.pdm.get_pending_deferred(deferredID, block)
+            return d
+        else:
+            d = self.remote_reference.callRemote('get_pending_deferred', deferredID, block)
+            d.addCallback(self.unpackage)
+            try:
+                callback = self._deferredIDCallbacks.pop(deferredID)
+            except KeyError:
+                callback = None
+            if callback is not None:
+                d.addCallback(callback[0], *callback[1], **callback[2])
+            return d
+    
+    def clear_pending_deferreds(self):
+        
+        # This clear both the local (self.pdm) and remote pending deferreds
+        self.pdm.clear_pending_deferreds()
+        d2 = self.remote_reference.callRemote('clear_pending_deferreds')
+        d2.addCallback(self.unpackage)
+        return d2
+    
+    def _addDeferredIDCallback(self, did, callback, *args, **kwargs):
+        self._deferredIDCallbacks[did] = (callback, args, kwargs)
+        return did
+       
+    #---------------------------------------------------------------------------
+    # IEngineMultiplexer related methods
+    #---------------------------------------------------------------------------
+        
+    def execute(self, lines, targets='all', block=True):
+        d = self.remote_reference.callRemote('execute', lines, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def push(self, namespace, targets='all', block=True):
+        serial = pickle.dumps(namespace, 2)
+        d =  self.remote_reference.callRemote('push', serial, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def pull(self, keys, targets='all', block=True):
+        d = self.remote_reference.callRemote('pull', keys, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def push_function(self, namespace, targets='all', block=True):
+        cannedNamespace = canDict(namespace)
+        serial = pickle.dumps(cannedNamespace, 2)
+        d = self.remote_reference.callRemote('push_function', serial, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def pull_function(self, keys, targets='all', block=True):
+        def uncan_functions(r, keys):
+            if len(keys)==1 or isinstance(keys, str):
+                return uncanSequence(r)
+            elif len(keys)>1:
+                return [uncanSequence(s) for s in r]
+        d = self.remote_reference.callRemote('pull_function', keys, targets, block)
+        if block:
+            d.addCallback(self.unpackage)
+            d.addCallback(uncan_functions, keys)
+        else:
+            d.addCallback(self.unpackage)
+            d.addCallback(lambda did: self._addDeferredIDCallback(did, uncan_functions, keys))
+        return d
+    
+    def push_serialized(self, namespace, targets='all', block=True):
+        cannedNamespace = canDict(namespace)
+        serial = pickle.dumps(cannedNamespace, 2)
+        d =  self.remote_reference.callRemote('push_serialized', serial, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def pull_serialized(self, keys, targets='all', block=True):
+        d = self.remote_reference.callRemote('pull_serialized', keys, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+        
+    def get_result(self, i=None, targets='all', block=True):
+        if i is None: # This is because None cannot be marshalled by xml-rpc
+            i = 'None'
+        d = self.remote_reference.callRemote('get_result', i, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def reset(self, targets='all', block=True):
+        d = self.remote_reference.callRemote('reset', targets, block)
+        d.addCallback(self.unpackage)
+        return d        
+    
+    def keys(self, targets='all', block=True):
+        d = self.remote_reference.callRemote('keys', targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def kill(self, controller=False, targets='all', block=True):
+        d = self.remote_reference.callRemote('kill', controller, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def clear_queue(self, targets='all', block=True):
+        d = self.remote_reference.callRemote('clear_queue', targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def queue_status(self, targets='all', block=True):
+        d = self.remote_reference.callRemote('queue_status', targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def set_properties(self, properties, targets='all', block=True):
+        serial = pickle.dumps(properties, 2)
+        d = self.remote_reference.callRemote('set_properties', serial, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def get_properties(self, keys=None, targets='all', block=True):
+        if keys==None:
+            keys='None'
+        d = self.remote_reference.callRemote('get_properties', keys, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def has_properties(self, keys, targets='all', block=True):
+        d = self.remote_reference.callRemote('has_properties', keys, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def del_properties(self, keys, targets='all', block=True):
+        d = self.remote_reference.callRemote('del_properties', keys, targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def clear_properties(self, targets='all', block=True):
+        d = self.remote_reference.callRemote('clear_properties', targets, block)
+        d.addCallback(self.unpackage)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # IMultiEngine related methods
+    #---------------------------------------------------------------------------
+    
+    def get_ids(self):
+        d = self.remote_reference.callRemote('get_ids')
+        return d
+    
+    #---------------------------------------------------------------------------
+    # ISynchronousMultiEngineCoordinator related methods
+    #---------------------------------------------------------------------------
+
+    def _process_targets(self, targets):
+        def create_targets(ids):
+            if isinstance(targets, int):
+                engines = [targets]
+            elif targets=='all':
+                engines = ids
+            elif isinstance(targets, (list, tuple)):
+                engines = targets
+            for t in engines:
+                if not t in ids:
+                    raise error.InvalidEngineID("engine with id %r does not exist"%t)
+            return engines
+        
+        d = self.get_ids()
+        d.addCallback(create_targets)
+        return d
+    
+    def scatter(self, key, seq, style='basic', flatten=False, targets='all', block=True):
+        
+        # Note: scatter and gather handle pending deferreds locally through self.pdm.
+        # This enables us to collect a bunch fo deferred ids and make a secondary 
+        # deferred id that corresponds to the entire group.  This logic is extremely
+        # difficult to get right though.
+        def do_scatter(engines):
+            nEngines = len(engines)
+            mapClass = Map.styles[style]
+            mapObject = mapClass()
+            d_list = []
+            # Loop through and push to each engine in non-blocking mode.
+            # This returns a set of deferreds to deferred_ids
+            for index, engineid in enumerate(engines):
+                partition = mapObject.getPartition(seq, index, nEngines)
+                if flatten and len(partition) == 1:
+                    d = self.push({key: partition[0]}, targets=engineid, block=False)
+                else:
+                    d = self.push({key: partition}, targets=engineid, block=False)
+                d_list.append(d)
+            # Collect the deferred to deferred_ids
+            d = gatherBoth(d_list,
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            # Now d has a list of deferred_ids or Failures coming
+            d.addCallback(error.collect_exceptions, 'scatter')
+            def process_did_list(did_list):
+                """Turn a list of deferred_ids into a final result or failure."""
+                new_d_list = [self.get_pending_deferred(did, True) for did in did_list]
+                final_d = gatherBoth(new_d_list,
+                                     fireOnOneErrback=0,
+                                     consumeErrors=1,
+                                     logErrors=0)
+                final_d.addCallback(error.collect_exceptions, 'scatter')
+                final_d.addCallback(lambda lop: [i[0] for i in lop])
+                return final_d
+            # Now, depending on block, we need to handle the list deferred_ids
+            # coming down the pipe diferently.
+            if block:
+                # If we are blocking register a callback that will transform the
+                # list of deferred_ids into the final result.
+                d.addCallback(process_did_list)
+                return d
+            else:
+                # Here we are going to use a _local_ PendingDeferredManager.
+                deferred_id = self.pdm.get_deferred_id()
+                # This is the deferred we will return to the user that will fire
+                # with the local deferred_id AFTER we have received the list of 
+                # primary deferred_ids
+                d_to_return = defer.Deferred()
+                def do_it(did_list):
+                    """Produce a deferred to the final result, but first fire the
+                    deferred we will return to the user that has the local
+                    deferred id."""
+                    d_to_return.callback(deferred_id)
+                    return process_did_list(did_list)
+                d.addCallback(do_it)
+                # Now save the deferred to the final result
+                self.pdm.save_pending_deferred(d, deferred_id)
+                return d_to_return
+
+        d = self._process_targets(targets)
+        d.addCallback(do_scatter)
+        return d
+
+    def gather(self, key, style='basic', targets='all', block=True):
+        
+        # Note: scatter and gather handle pending deferreds locally through self.pdm.
+        # This enables us to collect a bunch fo deferred ids and make a secondary 
+        # deferred id that corresponds to the entire group.  This logic is extremely
+        # difficult to get right though.
+        def do_gather(engines):
+            nEngines = len(engines)
+            mapClass = Map.styles[style]
+            mapObject = mapClass()
+            d_list = []
+            # Loop through and push to each engine in non-blocking mode.
+            # This returns a set of deferreds to deferred_ids
+            for index, engineid in enumerate(engines):
+                d = self.pull(key, targets=engineid, block=False)
+                d_list.append(d)
+            # Collect the deferred to deferred_ids
+            d = gatherBoth(d_list,
+                           fireOnOneErrback=0,
+                           consumeErrors=1,
+                           logErrors=0)
+            # Now d has a list of deferred_ids or Failures coming
+            d.addCallback(error.collect_exceptions, 'scatter')
+            def process_did_list(did_list):
+                """Turn a list of deferred_ids into a final result or failure."""
+                new_d_list = [self.get_pending_deferred(did, True) for did in did_list]
+                final_d = gatherBoth(new_d_list,
+                                     fireOnOneErrback=0,
+                                     consumeErrors=1,
+                                     logErrors=0)
+                final_d.addCallback(error.collect_exceptions, 'gather')
+                final_d.addCallback(lambda lop: [i[0] for i in lop])
+                final_d.addCallback(mapObject.joinPartitions)
+                return final_d
+            # Now, depending on block, we need to handle the list deferred_ids
+            # coming down the pipe diferently.
+            if block:
+                # If we are blocking register a callback that will transform the
+                # list of deferred_ids into the final result.
+                d.addCallback(process_did_list)
+                return d
+            else:
+                # Here we are going to use a _local_ PendingDeferredManager.
+                deferred_id = self.pdm.get_deferred_id()
+                # This is the deferred we will return to the user that will fire
+                # with the local deferred_id AFTER we have received the list of 
+                # primary deferred_ids
+                d_to_return = defer.Deferred()
+                def do_it(did_list):
+                    """Produce a deferred to the final result, but first fire the
+                    deferred we will return to the user that has the local
+                    deferred id."""
+                    d_to_return.callback(deferred_id)
+                    return process_did_list(did_list)
+                d.addCallback(do_it)
+                # Now save the deferred to the final result
+                self.pdm.save_pending_deferred(d, deferred_id)
+                return d_to_return
+
+        d = self._process_targets(targets)
+        d.addCallback(do_gather)
+        return d
+
+    def map(self, func, seq, style='basic', targets='all', block=True):
+        d_list = []
+        if isinstance(func, FunctionType):
+            d = self.push_function(dict(_ipython_map_func=func), targets=targets, block=False)
+            d.addCallback(lambda did: self.get_pending_deferred(did, True))
+            sourceToRun = '_ipython_map_seq_result = map(_ipython_map_func, _ipython_map_seq)'
+        elif isinstance(func, str):
+            d = defer.succeed(None)
+            sourceToRun = \
+                '_ipython_map_seq_result = map(%s, _ipython_map_seq)' % func
+        else:
+            raise TypeError("func must be a function or str")
+        
+        d.addCallback(lambda _: self.scatter('_ipython_map_seq', seq, style, targets=targets))
+        d.addCallback(lambda _: self.execute(sourceToRun, targets=targets, block=False))
+        d.addCallback(lambda did: self.get_pending_deferred(did, True))
+        d.addCallback(lambda _: self.gather('_ipython_map_seq_result', style, targets=targets, block=block))
+        return d
+
+    #---------------------------------------------------------------------------
+    # ISynchronousMultiEngineExtras related methods
+    #---------------------------------------------------------------------------
+    
+    def _transformPullResult(self, pushResult, multitargets, lenKeys):
+        if not multitargets:
+            result = pushResult[0]
+        elif lenKeys > 1:
+            result = zip(*pushResult)
+        elif lenKeys is 1:
+            result = list(pushResult)
+        return result
+    
+    def zip_pull(self, keys, targets='all', block=True):
+        multitargets = not isinstance(targets, int) and len(targets) > 1
+        lenKeys = len(keys)
+        d = self.pull(keys, targets=targets, block=block)
+        if block:
+            d.addCallback(self._transformPullResult, multitargets, lenKeys)
+        else:
+            d.addCallback(lambda did: self._addDeferredIDCallback(did, self._transformPullResult, multitargets, lenKeys))
+        return d
+    
+    def run(self, fname, targets='all', block=True):
+        fileobj = open(fname,'r')
+        source = fileobj.read()
+        fileobj.close()
+        # if the compilation blows, we get a local error right away
+        try:
+            code = compile(source,fname,'exec')
+        except:
+            return defer.fail(failure.Failure()) 
+        # Now run the code
+        d = self.execute(source, targets=targets, block=block)
+        return d
+    
+    #---------------------------------------------------------------------------
+    # IBlockingClientAdaptor related methods
+    #---------------------------------------------------------------------------
+    
+    def adapt_to_blocking_client(self):
+        from IPython.kernel.multiengineclient import IFullBlockingMultiEngineClient
+        return IFullBlockingMultiEngineClient(self)
diff --git a/IPython/kernel/newserialized.py b/IPython/kernel/newserialized.py
new file mode 100644
index 0000000..38ba3c7
--- /dev/null
+++ b/IPython/kernel/newserialized.py
@@ -0,0 +1,163 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_newserialized -*-
+
+"""Refactored serialization classes and interfaces."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import cPickle as pickle
+
+from zope.interface import Interface, implements
+from twisted.python import components
+
+try:
+    import numpy
+except ImportError:
+    pass
+
+from IPython.kernel.error import SerializationError
+
+class ISerialized(Interface):
+    
+    def getData():
+        """"""
+
+    def getDataSize(units=10.0**6):
+        """"""
+
+    def getTypeDescriptor():
+        """"""
+
+    def getMetadata():
+        """"""
+        
+        
+class IUnSerialized(Interface):
+    
+    def getObject():
+        """"""
+        
+class Serialized(object):
+    
+    implements(ISerialized)
+    
+    def __init__(self, data, typeDescriptor, metadata={}):
+        self.data = data
+        self.typeDescriptor = typeDescriptor
+        self.metadata = metadata
+        
+    def getData(self):
+        return self.data
+        
+    def getDataSize(self, units=10.0**6):
+        return len(self.data)/units
+        
+    def getTypeDescriptor(self):
+        return self.typeDescriptor
+        
+    def getMetadata(self):
+        return self.metadata
+
+        
+class UnSerialized(object):
+    
+    implements(IUnSerialized)
+        
+    def __init__(self, obj):
+        self.obj = obj
+        
+    def getObject(self):
+        return self.obj
+
+        
+class SerializeIt(object):
+    
+    implements(ISerialized)
+    
+    def __init__(self, unSerialized):
+        self.data = None
+        self.obj = unSerialized.getObject()
+        if globals().has_key('numpy'):
+            if isinstance(self.obj, numpy.ndarray):
+                if len(self.obj) == 0:         # length 0 arrays can't be reconstructed
+                    raise SerializationError("You cannot send a length 0 array")
+                self.obj = numpy.ascontiguousarray(self.obj, dtype=None)
+                self.typeDescriptor = 'ndarray'
+                self.metadata = {'shape':self.obj.shape,
+                                 'dtype':self.obj.dtype.str}
+            else:
+                self.typeDescriptor = 'pickle'
+                self.metadata = {}
+        else:
+            self.typeDescriptor = 'pickle'
+            self.metadata = {}
+        self._generateData()            
+    
+    def _generateData(self):
+        if self.typeDescriptor == 'ndarray':
+            self.data = numpy.getbuffer(self.obj)
+        elif self.typeDescriptor == 'pickle':
+            self.data = pickle.dumps(self.obj, 2)
+        else:
+            raise SerializationError("Really wierd serialization error.")
+        del self.obj
+        
+    def getData(self):
+        return self.data
+        
+    def getDataSize(self, units=10.0**6):
+        return len(self.data)/units
+        
+    def getTypeDescriptor(self):
+        return self.typeDescriptor
+        
+    def getMetadata(self):
+        return self.metadata
+
+
+class UnSerializeIt(UnSerialized):
+    
+    implements(IUnSerialized)
+    
+    def __init__(self, serialized):
+        self.serialized = serialized
+        
+    def getObject(self):
+        typeDescriptor = self.serialized.getTypeDescriptor()
+        if globals().has_key('numpy'):
+            if typeDescriptor == 'ndarray':
+                result = numpy.frombuffer(self.serialized.getData(), dtype = self.serialized.metadata['dtype'])
+                result.shape = self.serialized.metadata['shape']
+                # This is a hack to make the array writable.  We are working with
+                # the numpy folks to address this issue.
+                result = result.copy()
+            elif typeDescriptor == 'pickle':
+                result = pickle.loads(self.serialized.getData())
+            else:
+                raise SerializationError("Really wierd serialization error.")
+        elif typeDescriptor == 'pickle':
+            result = pickle.loads(self.serialized.getData())
+        else:
+            raise SerializationError("Really wierd serialization error.")
+        return result
+
+components.registerAdapter(UnSerializeIt, ISerialized, IUnSerialized)
+
+components.registerAdapter(SerializeIt, IUnSerialized, ISerialized)
+    
+def serialize(obj):
+    return ISerialized(UnSerialized(obj))
+    
+def unserialize(serialized):
+    return IUnSerialized(serialized).getObject()
diff --git a/IPython/kernel/parallelfunction.py b/IPython/kernel/parallelfunction.py
new file mode 100644
index 0000000..129b369
--- /dev/null
+++ b/IPython/kernel/parallelfunction.py
@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+"""A parallelized function that does scatter/execute/gather."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from types import FunctionType
+
+class ParallelFunction:
+    """A function that operates in parallel on sequences."""
+    def __init__(self, func, multiengine, targets, block):
+        """Create a `ParallelFunction`.
+        """
+        assert isinstance(func, (str, FunctionType)), "func must be a fuction or str"
+        self.func = func
+        self.multiengine = multiengine
+        self.targets = targets
+        self.block = block
+        
+    def __call__(self, sequence):
+        return self.multiengine.map(self.func, sequence, targets=self.targets, block=self.block)
\ No newline at end of file
diff --git a/IPython/kernel/pbconfig.py b/IPython/kernel/pbconfig.py
new file mode 100644
index 0000000..5fb5e4d
--- /dev/null
+++ b/IPython/kernel/pbconfig.py
@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+"""Low level configuration for Twisted's Perspective Broker protocol."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.spread import banana
+
+
+#-------------------------------------------------------------------------------
+# This is where you configure the size limit of the banana protocol that
+# PB uses.  WARNING, this only works if you are NOT using cBanana, which is
+# faster than banana.py.
+#-------------------------------------------------------------------------------
+
+
+
+#banana.SIZE_LIMIT = 640*1024           # The default of 640 kB
+banana.SIZE_LIMIT = 10*1024*1024       # 10 MB
+#banana.SIZE_LIMIT = 50*1024*1024       # 50 MB   
+    
+# This sets the size of chunks used when paging is used.    
+CHUNK_SIZE = 64*1024
diff --git a/IPython/kernel/pbutil.py b/IPython/kernel/pbutil.py
new file mode 100644
index 0000000..6ce8050
--- /dev/null
+++ b/IPython/kernel/pbutil.py
@@ -0,0 +1,93 @@
+# encoding: utf-8
+
+"""Utilities for PB using modules."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import cPickle as pickle
+
+from twisted.python.failure import Failure
+from twisted.python import failure
+import threading, sys
+
+from IPython.kernel import pbconfig
+from IPython.kernel.error import PBMessageSizeError, UnpickleableException
+
+
+#-------------------------------------------------------------------------------
+# The actual utilities
+#-------------------------------------------------------------------------------
+
+def packageFailure(f):
+    """Clean and pickle a failure preappending the string FAILURE:"""
+    
+    f.cleanFailure()
+    # This is sometimes helpful in debugging
+    #f.raiseException()
+    try:
+        pString = pickle.dumps(f, 2)
+    except pickle.PicklingError:
+        # Certain types of exceptions are not pickleable, for instance ones
+        # from Boost.Python.  We try to wrap them in something that is
+        f.type = UnpickleableException
+        f.value = UnpickleableException(str(f.type) + ": " + str(f.value))
+        pString = pickle.dumps(f, 2)
+    return 'FAILURE:' + pString
+
+def unpackageFailure(r):
+    """
+    See if a returned value is a pickled Failure object.
+
+    To distinguish between general pickled objects and pickled Failures, the
+    other side should prepend the string FAILURE: to any pickled Failure.
+    """
+    if isinstance(r, str):
+        if r.startswith('FAILURE:'):
+            try:
+                result = pickle.loads(r[8:])
+            except pickle.PickleError:
+                return failure.Failure( \
+                    FailureUnpickleable("Could not unpickle failure."))
+            else:
+                return result
+    return r
+
+def checkMessageSize(m, info):
+    """Check string m to see if it violates banana.SIZE_LIMIT.
+    
+    This should be used on the client side of things for push, scatter
+    and push_serialized and on the other end for pull, gather and pull_serialized.
+    
+    :Parameters:
+        `m` : string
+            Message whose size will be checked.
+        `info` : string
+            String describing what object the message refers to.
+            
+    :Exceptions:
+        - `PBMessageSizeError`: Raised in the message is > banana.SIZE_LIMIT
+
+    :returns: The original message or a Failure wrapping a PBMessageSizeError
+    """
+
+    if len(m) > pbconfig.banana.SIZE_LIMIT:
+        s = """Objects too big to transfer:
+Names:            %s
+Actual Size (kB): %d
+SIZE_LIMIT  (kB): %d
+* SIZE_LIMIT can be set in kernel.pbconfig""" \
+            % (info, len(m)/1024, pbconfig.banana.SIZE_LIMIT/1024)
+        return Failure(PBMessageSizeError(s))
+    else:
+        return m
\ No newline at end of file
diff --git a/IPython/kernel/pendingdeferred.py b/IPython/kernel/pendingdeferred.py
new file mode 100644
index 0000000..40c890b
--- /dev/null
+++ b/IPython/kernel/pendingdeferred.py
@@ -0,0 +1,178 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.test.test_pendingdeferred -*-
+
+"""Classes to manage pending Deferreds.
+
+A pending deferred is a deferred that may or may not have fired.  This module
+is useful for taking a class whose methods return deferreds and wrapping it to
+provide API that keeps track of those deferreds for later retrieval.  See the
+tests for examples of its usage.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.application import service
+from twisted.internet import defer, reactor
+from twisted.python import log, components, failure
+from zope.interface import Interface, implements, Attribute
+
+from IPython.kernel.twistedutil import gatherBoth
+from IPython.kernel import error
+from IPython.external import guid
+from IPython.tools import growl
+
+class PendingDeferredManager(object):
+    """A class to track pending deferreds.
+    
+    To track a pending deferred, the user of this class must first
+    get a deferredID by calling `get_next_deferred_id`.  Then the user
+    calls `save_pending_deferred` passing that id and the deferred to
+    be tracked.  To later retrieve it, the user calls
+    `get_pending_deferred` passing the id.
+    """
+    
+    def __init__(self):
+        """Manage pending deferreds."""
+
+        self.results = {} # Populated when results are ready
+        self.deferred_ids = [] # List of deferred ids I am managing
+        self.deferreds_to_callback = {} # dict of lists of deferreds to callback
+        
+    def get_deferred_id(self):
+        return guid.generate()
+    
+    def quick_has_id(self, deferred_id):
+        return deferred_id in self.deferred_ids
+    
+    def _save_result(self, result, deferred_id):
+        if self.quick_has_id(deferred_id):
+            self.results[deferred_id] = result
+            self._trigger_callbacks(deferred_id)
+    
+    def _trigger_callbacks(self, deferred_id):
+        # Go through and call the waiting callbacks
+        result = self.results.get(deferred_id)
+        if result is not None:  # Only trigger if there is a result
+            try:
+                d = self.deferreds_to_callback.pop(deferred_id)
+            except KeyError:
+                d = None
+            if d is not None:
+                if isinstance(result, failure.Failure):
+                    d.errback(result)
+                else:
+                    d.callback(result)
+                self.delete_pending_deferred(deferred_id)
+                   
+    def save_pending_deferred(self, d, deferred_id=None):
+        """Save the result of a deferred for later retrieval.
+        
+        This works even if the deferred has not fired.
+        
+        Only callbacks and errbacks applied to d before this method
+        is called will be called no the final result.
+        """
+        if deferred_id is None:
+            deferred_id = self.get_deferred_id()
+        self.deferred_ids.append(deferred_id)
+        d.addBoth(self._save_result, deferred_id)
+        return deferred_id
+    
+    def _protected_del(self, key, container):
+        try:
+            del container[key]
+        except Exception:
+            pass
+    
+    def delete_pending_deferred(self, deferred_id):
+        """Remove a deferred I am tracking and add a null Errback.
+        
+        :Parameters:
+            deferredID : str
+                The id of a deferred that I am tracking.
+        """
+        if self.quick_has_id(deferred_id):
+            # First go through a errback any deferreds that are still waiting
+            d = self.deferreds_to_callback.get(deferred_id)
+            if d is not None:
+                d.errback(failure.Failure(error.AbortedPendingDeferredError("pending deferred has been deleted: %r"%deferred_id)))
+            # Now delete all references to this deferred_id
+            ind = self.deferred_ids.index(deferred_id)
+            self._protected_del(ind, self.deferred_ids)
+            self._protected_del(deferred_id, self.deferreds_to_callback)
+            self._protected_del(deferred_id, self.results)            
+        else:
+            raise error.InvalidDeferredID('invalid deferred_id: %r' % deferred_id)
+    
+    def clear_pending_deferreds(self):
+        """Remove all the deferreds I am tracking."""
+        for did in self.deferred_ids:
+            self.delete_pending_deferred(did)
+        
+    def _delete_and_pass_through(self, r, deferred_id):
+        self.delete_pending_deferred(deferred_id)
+        return r
+        
+    def get_pending_deferred(self, deferred_id, block):
+        if not self.quick_has_id(deferred_id) or self.deferreds_to_callback.get(deferred_id) is not None:
+            return defer.fail(failure.Failure(error.InvalidDeferredID('invalid deferred_id: %r' + deferred_id)))
+        result = self.results.get(deferred_id)
+        if result is not None:
+            self.delete_pending_deferred(deferred_id)
+            if isinstance(result, failure.Failure):
+                return defer.fail(result)
+            else:
+                return defer.succeed(result)
+        else:  # Result is not ready
+            if block:
+                d = defer.Deferred()
+                self.deferreds_to_callback[deferred_id] = d
+                return d
+            else:
+                return defer.fail(failure.Failure(error.ResultNotCompleted("result not completed: %r" % deferred_id)))
+
+def two_phase(wrapped_method):
+    """Wrap methods that return a deferred into a two phase process.
+    
+    This transforms::
+    
+        foo(arg1, arg2, ...) -> foo(arg1, arg2,...,block=True).
+    
+    The wrapped method will then return a deferred to a deferred id.  This will
+    only work on method of classes that inherit from `PendingDeferredManager`,
+    as that class provides an API for 
+    
+    block is a boolean to determine if we should use the two phase process or
+    just simply call the wrapped method.  At this point block does not have a
+    default and it probably won't.
+    """
+    
+    def wrapper_two_phase(pdm, *args, **kwargs):
+        try:
+            block = kwargs.pop('block')
+        except KeyError:
+            block = True  # The default if not specified
+        if block:
+            return wrapped_method(pdm, *args, **kwargs)
+        else:
+            d = wrapped_method(pdm, *args, **kwargs)
+            deferred_id=pdm.save_pending_deferred(d)
+            return defer.succeed(deferred_id)
+    
+    return wrapper_two_phase
+                
+                
+            
+            
+                
diff --git a/IPython/kernel/pickleutil.py b/IPython/kernel/pickleutil.py
new file mode 100644
index 0000000..087a61c
--- /dev/null
+++ b/IPython/kernel/pickleutil.py
@@ -0,0 +1,83 @@
+# encoding: utf-8
+
+"""Pickle related utilities."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from types import FunctionType
+from twisted.python import log
+
+class CannedObject(object):
+    pass
+    
+class CannedFunction(CannedObject):
+    
+    def __init__(self, f):
+        self._checkType(f)    
+        self.code = f.func_code
+    
+    def _checkType(self, obj):
+        assert isinstance(obj, FunctionType), "Not a function type"
+    
+    def getFunction(self, g=None):
+        if g is None:
+            g = globals()
+        newFunc = FunctionType(self.code, g)
+        return newFunc
+
+def can(obj):
+    if isinstance(obj, FunctionType):
+        return CannedFunction(obj)
+    else:
+        return obj
+
+def canDict(obj):
+    if isinstance(obj, dict):
+        for k, v in obj.iteritems():
+            obj[k] = can(v)
+        return obj
+    else:
+        return obj
+
+def canSequence(obj):
+    if isinstance(obj, (list, tuple)):
+        t = type(obj)
+        return t([can(i) for i in obj])
+    else:
+        return obj
+
+def uncan(obj, g=None):
+    if isinstance(obj, CannedFunction):
+        return obj.getFunction(g)
+    else:
+        return obj
+
+def uncanDict(obj, g=None):
+    if isinstance(obj, dict):
+        for k, v in obj.iteritems():
+            obj[k] = uncan(v,g)
+        return obj
+    else:
+        return obj
+
+def uncanSequence(obj, g=None):
+    if isinstance(obj, (list, tuple)):
+        t = type(obj)
+        return t([uncan(i,g) for i in obj])
+    else:
+        return obj
+
+
+def rebindFunctionGlobals(f, glbls):
+    return FunctionType(f.func_code, glbls)
diff --git a/IPython/kernel/scripts/__init__.py b/IPython/kernel/scripts/__init__.py
new file mode 100644
index 0000000..4e77672
--- /dev/null
+++ b/IPython/kernel/scripts/__init__.py
@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+""""""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/kernel/scripts/ipcluster b/IPython/kernel/scripts/ipcluster
new file mode 100644
index 0000000..362a725
--- /dev/null
+++ b/IPython/kernel/scripts/ipcluster
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""ipcluster script"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+	from IPython.kernel.scripts import ipcluster
+	ipcluster.main()
+
diff --git a/IPython/kernel/scripts/ipcluster.py b/IPython/kernel/scripts/ipcluster.py
new file mode 100755
index 0000000..5f5795d
--- /dev/null
+++ b/IPython/kernel/scripts/ipcluster.py
@@ -0,0 +1,323 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Start an IPython cluster conveniently, either locally or remotely.
+
+Basic usage
+-----------
+
+For local operation, the simplest mode of usage is:
+
+  %prog -n N
+
+where N is the number of engines you want started.
+
+For remote operation, you must call it with a cluster description file:
+
+  %prog -f clusterfile.py
+
+The cluster file is a normal Python script which gets run via execfile().  You
+can have arbitrary logic in it, but all that matters is that at the end of the
+execution, it declares the variables 'controller', 'engines', and optionally
+'sshx'.  See the accompanying examples for details on what these variables must
+contain.
+
+
+Notes
+-----
+
+WARNING: this code is still UNFINISHED and EXPERIMENTAL!  It is incomplete,
+some listed options are not really implemented, and all of its interfaces are
+subject to change.
+
+When operating over SSH for a remote cluster, this program relies on the
+existence of a particular script called 'sshx'.  This script must live in the
+target systems where you'll be running your controller and engines, and is
+needed to configure your PATH and PYTHONPATH variables for further execution of
+python code at the other end of an SSH connection.  The script can be as simple
+as:
+
+#!/bin/sh
+. $HOME/.bashrc
+"$@"
+
+which is the default one provided by IPython.  You can modify this or provide
+your own.  Since it's quite likely that for different clusters you may need
+this script to configure things differently or that it may live in different
+locations, its full path can be set in the same file where you define the
+cluster setup.  IPython's order of evaluation for this variable is the
+following:
+
+  a) Internal default: 'sshx'.  This only works if it is in the default system
+  path which SSH sets up in non-interactive mode.
+
+  b) Environment variable: if $IPYTHON_SSHX is defined, this overrides the
+  internal default.
+
+  c) Variable 'sshx' in the cluster configuration file: finally, this will
+  override the previous two values.
+ 
+This code is Unix-only, with precious little hope of any of this ever working
+under Windows, since we need SSH from the ground up, we background processes,
+etc.  Ports of this functionality to Windows are welcome.
+
+
+Call summary
+------------
+
+    %prog [options]
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Stdlib imports
+#-------------------------------------------------------------------------------
+
+import os
+import signal
+import sys
+import time
+
+from optparse import OptionParser
+from subprocess import Popen,call
+
+#---------------------------------------------------------------------------
+# IPython imports
+#---------------------------------------------------------------------------
+from IPython.tools import utils
+from IPython.config import cutils
+
+#---------------------------------------------------------------------------
+# Normal code begins
+#---------------------------------------------------------------------------
+
+def parse_args():
+    """Parse command line and return opts,args."""
+
+    parser = OptionParser(usage=__doc__)
+    newopt = parser.add_option  # shorthand
+
+    newopt("--controller-port", type="int", dest="controllerport",
+           help="the TCP port the controller is listening on")
+
+    newopt("--controller-ip", type="string", dest="controllerip",
+           help="the TCP ip address of the controller")
+
+    newopt("-n", "--num", type="int", dest="n",default=2,
+           help="the number of engines to start")
+
+    newopt("--engine-port", type="int", dest="engineport",
+           help="the TCP port the controller will listen on for engine "
+           "connections")
+    
+    newopt("--engine-ip", type="string", dest="engineip",
+           help="the TCP ip address the controller will listen on "
+           "for engine connections")
+
+    newopt("--mpi", type="string", dest="mpi",
+           help="use mpi with package:  for instance --mpi=mpi4py")
+    
+    newopt("-l", "--logfile", type="string", dest="logfile",
+           help="log file name")
+
+    newopt('-f','--cluster-file',dest='clusterfile',
+           help='file describing a remote cluster')
+
+    return parser.parse_args()
+
+def numAlive(controller,engines):
+    """Return the number of processes still alive."""
+    retcodes = [controller.poll()] + \
+               [e.poll() for e in engines]
+    return retcodes.count(None)
+
+stop = lambda pid: os.kill(pid,signal.SIGINT)
+kill = lambda pid: os.kill(pid,signal.SIGTERM)
+
+def cleanup(clean,controller,engines):
+    """Stop the controller and engines with the given cleanup method."""
+    
+    for e in engines:
+        if e.poll() is None:
+            print 'Stopping engine, pid',e.pid
+            clean(e.pid)
+    if controller.poll() is None:
+        print 'Stopping controller, pid',controller.pid
+        clean(controller.pid)
+
+
+def ensureDir(path):
+    """Ensure a directory exists or raise an exception."""
+    if not os.path.isdir(path):
+        os.makedirs(path)
+
+
+def startMsg(control_host,control_port=10105):
+    """Print a startup message"""
+    print
+    print 'Your cluster is up and running.'
+    print
+    print 'For interactive use, you can make a MultiEngineClient with:'
+    print
+    print 'from IPython.kernel import client'
+    print "mec = client.MultiEngineClient((%r,%s))" % \
+          (control_host,control_port)
+    print
+    print 'You can then cleanly stop the cluster from IPython using:'
+    print
+    print 'mec.kill(controller=True)'
+    print
+
+    
+def clusterLocal(opt,arg):
+    """Start a cluster on the local machine."""
+    
+    # Store all logs inside the ipython directory
+    ipdir = cutils.get_ipython_dir()
+    pjoin = os.path.join
+
+    logfile = opt.logfile
+    if logfile is None:
+        logdir_base = pjoin(ipdir,'log')
+        ensureDir(logdir_base)
+        logfile = pjoin(logdir_base,'ipcluster-')
+
+    print 'Starting controller:',
+    controller = Popen(['ipcontroller','--logfile',logfile])
+    print 'Controller PID:',controller.pid
+
+    print 'Starting engines:   ',
+    time.sleep(3)
+
+    englogfile = '%s%s-' % (logfile,controller.pid)
+    mpi = opt.mpi
+    if mpi: # start with mpi - killing the engines with sigterm will not work if you do this
+        engines = [Popen(['mpirun', '-np', str(opt.n), 'ipengine', '--mpi', mpi, '--logfile',englogfile])]
+    else: # do what we would normally do
+        engines = [ Popen(['ipengine','--logfile',englogfile])
+                    for i in range(opt.n) ]
+    eids = [e.pid for e in engines]
+    print 'Engines PIDs:  ',eids
+    print 'Log files: %s*' % englogfile
+    
+    proc_ids = eids + [controller.pid]
+    procs = engines + [controller]
+
+    grpid = os.getpgrp()
+    try:
+        startMsg('127.0.0.1')
+        print 'You can also hit Ctrl-C to stop it, or use from the cmd line:'
+        print
+        print 'kill -INT',grpid
+        print
+        try:
+            while True:
+                time.sleep(5)
+        except:
+            pass
+    finally:
+        print 'Stopping cluster.  Cleaning up...'
+        cleanup(stop,controller,engines)
+        for i in range(4):
+            time.sleep(i+2)
+            nZombies = numAlive(controller,engines)
+            if  nZombies== 0:
+                print 'OK: All processes cleaned up.'
+                break
+            print 'Trying again, %d processes did not stop...' % nZombies
+            cleanup(kill,controller,engines)
+            if numAlive(controller,engines) == 0:
+                print 'OK: All processes cleaned up.'
+                break
+        else:
+            print '*'*75
+            print 'ERROR: could not kill some processes, try to do it',
+            print 'manually.'
+            zombies = []
+            if controller.returncode is None:
+                print 'Controller is alive: pid =',controller.pid
+                zombies.append(controller.pid)
+            liveEngines = [ e for e in engines if e.returncode is None ]
+            for e in liveEngines:
+                print 'Engine is alive:     pid =',e.pid
+                zombies.append(e.pid)
+            print
+            print 'Zombie summary:',' '.join(map(str,zombies))
+
+def clusterRemote(opt,arg):
+    """Start a remote cluster over SSH"""
+
+    # Load the remote cluster configuration
+    clConfig = {}
+    execfile(opt.clusterfile,clConfig)
+    contConfig = clConfig['controller']
+    engConfig = clConfig['engines']
+    # Determine where to find sshx:
+    sshx = clConfig.get('sshx',os.environ.get('IPYTHON_SSHX','sshx'))
+    
+    # Store all logs inside the ipython directory
+    ipdir = cutils.get_ipython_dir()
+    pjoin = os.path.join
+
+    logfile = opt.logfile
+    if logfile is None:
+        logdir_base = pjoin(ipdir,'log')
+        ensureDir(logdir_base)
+        logfile = pjoin(logdir_base,'ipcluster')
+
+    # Append this script's PID to the logfile name always
+    logfile = '%s-%s' % (logfile,os.getpid())
+    
+    print 'Starting controller:'
+    # Controller data:
+    xsys = os.system
+
+    contHost = contConfig['host']
+    contLog = '%s-con-%s-' % (logfile,contHost)
+    cmd = "ssh %s '%s' 'ipcontroller --logfile %s' &" % \
+          (contHost,sshx,contLog)
+    #print 'cmd:<%s>' % cmd  # dbg
+    xsys(cmd)
+    time.sleep(2)
+
+    print 'Starting engines:   '
+    for engineHost,engineData in engConfig.iteritems():
+        if isinstance(engineData,int):
+            numEngines = engineData
+        else:
+            raise NotImplementedError('port configuration not finished for engines')
+
+        print 'Sarting %d engines on %s' % (numEngines,engineHost)
+        engLog = '%s-eng-%s-' % (logfile,engineHost)
+        for i in range(numEngines):
+            cmd = "ssh %s '%s' 'ipengine --controller-ip %s --logfile %s' &" % \
+                      (engineHost,sshx,contHost,engLog)
+            #print 'cmd:<%s>' % cmd  # dbg
+            xsys(cmd)
+        # Wait after each host a little bit
+        time.sleep(1)
+            
+    startMsg(contConfig['host'])
+        
+def main():
+    """Main driver for the two big options: local or remote cluster."""
+    
+    opt,arg = parse_args()
+
+    clusterfile = opt.clusterfile
+    if clusterfile:
+        clusterRemote(opt,arg)
+    else:
+        clusterLocal(opt,arg)
+        
+            
+if __name__=='__main__':
+    main()
diff --git a/IPython/kernel/scripts/ipcontroller b/IPython/kernel/scripts/ipcontroller
new file mode 100644
index 0000000..b4c86a4
--- /dev/null
+++ b/IPython/kernel/scripts/ipcontroller
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+	from IPython.kernel.scripts import ipcontroller
+	ipcontroller.main()
+
diff --git a/IPython/kernel/scripts/ipcontroller.py b/IPython/kernel/scripts/ipcontroller.py
new file mode 100755
index 0000000..26736c4
--- /dev/null
+++ b/IPython/kernel/scripts/ipcontroller.py
@@ -0,0 +1,366 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""The IPython controller."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+# Python looks for an empty string at the beginning of sys.path to enable
+# importing from the cwd.
+import sys
+sys.path.insert(0, '')
+
+import sys, time, os
+from optparse import OptionParser
+
+from twisted.application import internet, service
+from twisted.internet import reactor, error, defer
+from twisted.python import log
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub, have_crypto
+
+# from IPython.tools import growl
+# growl.start("IPython1 Controller")
+
+from IPython.kernel.error import SecurityError
+from IPython.kernel import controllerservice
+from IPython.kernel.fcutil import check_furl_file_security
+
+from IPython.kernel.config import config_manager as kernel_config_manager
+from IPython.config.cutils import import_item
+
+
+#-------------------------------------------------------------------------------
+# Code
+#-------------------------------------------------------------------------------
+
+def make_tub(ip, port, secure, cert_file):
+    """
+    Create a listening tub given an ip, port, and cert_file location.
+    
+    :Parameters:
+        ip : str
+            The ip address that the tub should listen on.  Empty means all
+        port : int
+            The port that the tub should listen on.  A value of 0 means
+            pick a random port
+        secure: boolean
+            Will the connection be secure (in the foolscap sense)
+        cert_file:
+            A filename of a file to be used for theSSL certificate
+    """
+    if secure:
+        if have_crypto:
+            tub = Tub(certFile=cert_file)
+        else:
+            raise SecurityError("OpenSSL is not available, so we can't run in secure mode, aborting")
+    else:
+        tub = UnauthenticatedTub()
+    
+    # Set the strport based on the ip and port and start listening
+    if ip == '':
+        strport = "tcp:%i" % port
+    else:
+        strport = "tcp:%i:interface=%s" % (port, ip)
+    listener = tub.listenOn(strport)
+    
+    return tub, listener
+
+def make_client_service(controller_service, config):
+    """
+    Create a service that will listen for clients.
+    
+    This service is simply a `foolscap.Tub` instance that has a set of Referenceables
+    registered with it.
+    """
+
+    # Now create the foolscap tub
+    ip = config['controller']['client_tub']['ip']
+    port = config['controller']['client_tub'].as_int('port')
+    location = config['controller']['client_tub']['location']
+    secure = config['controller']['client_tub']['secure']
+    cert_file = config['controller']['client_tub']['cert_file']
+    client_tub, client_listener = make_tub(ip, port, secure, cert_file)
+    
+    # Set the location in the trivial case of localhost
+    if ip == 'localhost' or ip == '127.0.0.1':
+        location = "127.0.0.1"
+    
+    if not secure:
+        log.msg("WARNING: you are running the controller with no client security")
+    
+    def set_location_and_register():
+        """Set the location for the tub and return a deferred."""
+
+        def register(empty, ref, furl_file):
+            client_tub.registerReference(ref, furlFile=furl_file)
+        
+        if location == '':
+            d = client_tub.setLocationAutomatically()
+        else:
+            d = defer.maybeDeferred(client_tub.setLocation, "%s:%i" % (location, client_listener.getPortnum()))
+            
+        for ciname, ci in config['controller']['controller_interfaces'].iteritems():
+            log.msg("Adapting Controller to interface: %s" % ciname)
+            furl_file = ci['furl_file']
+            log.msg("Saving furl for interface [%s] to file: %s" % (ciname, furl_file))
+            check_furl_file_security(furl_file, secure)
+            adapted_controller = import_item(ci['controller_interface'])(controller_service)
+            d.addCallback(register, import_item(ci['fc_interface'])(adapted_controller), 
+                furl_file=ci['furl_file'])
+    
+    reactor.callWhenRunning(set_location_and_register)
+    return client_tub
+
+
+def make_engine_service(controller_service, config):
+    """
+    Create a service that will listen for engines.
+    
+    This service is simply a `foolscap.Tub` instance that has a set of Referenceables
+    registered with it.
+    """
+
+    # Now create the foolscap tub
+    ip = config['controller']['engine_tub']['ip']
+    port = config['controller']['engine_tub'].as_int('port')
+    location = config['controller']['engine_tub']['location']
+    secure = config['controller']['engine_tub']['secure']
+    cert_file = config['controller']['engine_tub']['cert_file']
+    engine_tub, engine_listener = make_tub(ip, port, secure, cert_file)
+    
+    # Set the location in the trivial case of localhost
+    if ip == 'localhost' or ip == '127.0.0.1':
+        location = "127.0.0.1"
+    
+    if not secure:
+        log.msg("WARNING: you are running the controller with no engine security")
+    
+    def set_location_and_register():
+        """Set the location for the tub and return a deferred."""
+
+        def register(empty, ref, furl_file):
+            engine_tub.registerReference(ref, furlFile=furl_file)
+        
+        if location == '':
+            d = engine_tub.setLocationAutomatically()
+        else:
+            d = defer.maybeDeferred(engine_tub.setLocation, "%s:%i" % (location, engine_listener.getPortnum()))
+    
+        furl_file = config['controller']['engine_furl_file']
+        engine_fc_interface = import_item(config['controller']['engine_fc_interface'])
+        log.msg("Saving furl for the engine to file: %s" % furl_file)
+        check_furl_file_security(furl_file, secure)
+        fc_controller = engine_fc_interface(controller_service)
+        d.addCallback(register, fc_controller, furl_file=furl_file)
+    
+    reactor.callWhenRunning(set_location_and_register)
+    return engine_tub
+    
+def start_controller():
+    """
+    Start the controller by creating the service hierarchy and starting the reactor.
+    
+    This method does the following:
+    
+        * It starts the controller logging
+        * In execute an import statement for the controller
+        * It creates 2 `foolscap.Tub` instances for the client and the engines
+          and registers `foolscap.Referenceables` with the tubs to expose the
+          controller to engines and clients.
+    """
+    config = kernel_config_manager.get_config_obj()
+    
+    # Start logging
+    logfile = config['controller']['logfile']
+    if logfile:
+        logfile = logfile + str(os.getpid()) + '.log'
+        try:
+            openLogFile = open(logfile, 'w')
+        except:
+            openLogFile = sys.stdout
+    else:
+        openLogFile = sys.stdout
+    log.startLogging(openLogFile)
+    
+    # Execute any user defined import statements
+    cis = config['controller']['import_statement']
+    if cis:
+        try:
+            exec cis in globals(), locals()
+        except:
+            log.msg("Error running import_statement: %s" % cis)
+    
+    # Create the service hierarchy
+    main_service = service.MultiService()
+    # The controller service
+    controller_service = controllerservice.ControllerService()
+    controller_service.setServiceParent(main_service)
+    # The client tub and all its refereceables
+    client_service = make_client_service(controller_service, config)
+    client_service.setServiceParent(main_service)
+    # The engine tub
+    engine_service = make_engine_service(controller_service, config)
+    engine_service.setServiceParent(main_service)
+    # Start the controller service and set things running
+    main_service.startService()
+    reactor.run()
+
+def init_config():
+    """
+    Initialize the configuration using default and command line options.
+    """
+    
+    parser = OptionParser()
+    
+    # Client related options
+    parser.add_option(
+        "--client-ip", 
+        type="string",
+        dest="client_ip",
+        help="the IP address or hostname the controller will listen on for client connections"
+    )
+    parser.add_option(
+        "--client-port", 
+        type="int", 
+        dest="client_port",
+        help="the port the controller will listen on for client connections"
+    )    
+    parser.add_option(
+        '--client-location',
+        type="string",
+        dest="client_location",
+        help="hostname or ip for clients to connect to"
+    )
+    parser.add_option(
+        "-x",
+        action="store_false",
+        dest="client_secure",
+        help="turn off all client security"
+    )
+    parser.add_option(
+        '--client-cert-file',
+        type="string",
+        dest="client_cert_file",
+        help="file to store the client SSL certificate"
+    )
+    parser.add_option(
+        '--task-furl-file',
+        type="string",
+        dest="task_furl_file",
+        help="file to store the FURL for task clients to connect with"
+    )
+    parser.add_option(
+        '--multiengine-furl-file',
+        type="string",
+        dest="multiengine_furl_file",
+        help="file to store the FURL for multiengine clients to connect with"
+    )
+    # Engine related options
+    parser.add_option(
+        "--engine-ip", 
+        type="string",
+        dest="engine_ip",
+        help="the IP address or hostname the controller will listen on for engine connections"
+    )
+    parser.add_option(
+        "--engine-port", 
+        type="int", 
+        dest="engine_port",
+        help="the port the controller will listen on for engine connections"
+    )    
+    parser.add_option(
+        '--engine-location',
+        type="string",
+        dest="engine_location",
+        help="hostname or ip for engines to connect to"
+    )
+    parser.add_option(
+        "-y",
+        action="store_false",
+        dest="engine_secure",
+        help="turn off all engine security"
+    )
+    parser.add_option(
+        '--engine-cert-file',
+        type="string",
+        dest="engine_cert_file",
+        help="file to store the engine SSL certificate"
+    )
+    parser.add_option(
+        '--engine-furl-file',
+        type="string",
+        dest="engine_furl_file",
+        help="file to store the FURL for engines to connect with"
+    )
+    parser.add_option(
+        "-l", "--logfile",
+        type="string",
+        dest="logfile",
+        help="log file name (default is stdout)"
+    )
+    parser.add_option(
+        "--ipythondir",
+        type="string",
+        dest="ipythondir",
+        help="look for config files and profiles in this directory"
+    )
+    
+    (options, args) = parser.parse_args()
+    
+    kernel_config_manager.update_config_obj_from_default_file(options.ipythondir)
+    config = kernel_config_manager.get_config_obj()
+    
+    # Update with command line options
+    if options.client_ip is not None:
+        config['controller']['client_tub']['ip'] = options.client_ip
+    if options.client_port is not None:
+        config['controller']['client_tub']['port'] = options.client_port
+    if options.client_location is not None:
+        config['controller']['client_tub']['location'] = options.client_location
+    if options.client_secure is not None:
+        config['controller']['client_tub']['secure'] = options.client_secure
+    if options.client_cert_file is not None:
+        config['controller']['client_tub']['cert_file'] = options.client_cert_file
+    if options.task_furl_file is not None:
+        config['controller']['controller_interfaces']['task']['furl_file'] = options.task_furl_file
+    if options.multiengine_furl_file is not None:
+        config['controller']['controller_interfaces']['multiengine']['furl_file'] = options.multiengine_furl_file
+    if options.engine_ip is not None:
+        config['controller']['engine_tub']['ip'] = options.engine_ip
+    if options.engine_port is not None:
+        config['controller']['engine_tub']['port'] = options.engine_port
+    if options.engine_location is not None:
+        config['controller']['engine_tub']['location'] = options.engine_location
+    if options.engine_secure is not None:
+        config['controller']['engine_tub']['secure'] = options.engine_secure
+    if options.engine_cert_file is not None:
+        config['controller']['engine_tub']['cert_file'] = options.engine_cert_file
+    if options.engine_furl_file is not None:
+        config['controller']['engine_furl_file'] = options.engine_furl_file
+
+    if options.logfile is not None:
+        config['controller']['logfile'] = options.logfile
+    
+    kernel_config_manager.update_config_obj(config)
+
+def main():
+    """
+    After creating the configuration information, start the controller.
+    """
+    init_config()
+    start_controller()
+    
+if __name__ == "__main__":
+    main()
diff --git a/IPython/kernel/scripts/ipengine b/IPython/kernel/scripts/ipengine
new file mode 100644
index 0000000..92eab1c
--- /dev/null
+++ b/IPython/kernel/scripts/ipengine
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+	from IPython.kernel.scripts import ipengine
+	ipengine.main()
+
diff --git a/IPython/kernel/scripts/ipengine.py b/IPython/kernel/scripts/ipengine.py
new file mode 100755
index 0000000..9f02ea1
--- /dev/null
+++ b/IPython/kernel/scripts/ipengine.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Start the IPython Engine."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+# Python looks for an empty string at the beginning of sys.path to enable
+# importing from the cwd.
+import sys
+sys.path.insert(0, '')
+
+import sys, os
+from optparse import OptionParser
+
+from twisted.application import service
+from twisted.internet import reactor
+from twisted.python import log
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.kernel.core.config import config_manager as core_config_manager
+from IPython.config.cutils import import_item
+from IPython.kernel.engineservice import EngineService
+from IPython.kernel.config import config_manager as kernel_config_manager
+from IPython.kernel.engineconnector import EngineConnector
+
+
+#-------------------------------------------------------------------------------
+# Code
+#-------------------------------------------------------------------------------
+
+def start_engine():
+    """
+    Start the engine, by creating it and starting the Twisted reactor.
+    
+    This method does:
+    
+        * If it exists, runs the `mpi_import_statement` to call `MPI_Init`
+        * Starts the engine logging
+        * Creates an IPython shell and wraps it in an `EngineService`
+        * Creates a `foolscap.Tub` to use in connecting to a controller.
+        * Uses the tub and the `EngineService` along with a Foolscap URL
+          (or FURL) to connect to the controller and register the engine
+          with the controller
+    """
+    kernel_config = kernel_config_manager.get_config_obj()
+    core_config = core_config_manager.get_config_obj()
+    
+    # Execute the mpi import statement that needs to call MPI_Init
+    mpikey = kernel_config['mpi']['default']
+    mpi_import_statement = kernel_config['mpi'].get(mpikey, None)
+    if mpi_import_statement is not None:
+        try:
+            exec mpi_import_statement in locals(), globals()
+        except:
+            mpi = None
+    else:
+        mpi = None
+    
+    # Start logging
+    logfile = kernel_config['engine']['logfile']
+    if logfile:
+        logfile = logfile + str(os.getpid()) + '.log'
+        try:
+            openLogFile = open(logfile, 'w')
+        except:
+            openLogFile = sys.stdout
+    else:
+        openLogFile = sys.stdout
+    log.startLogging(openLogFile)
+    
+    # Create the underlying shell class and EngineService
+    shell_class = import_item(core_config['shell']['shell_class'])
+    engine_service = EngineService(shell_class, mpi=mpi)
+    shell_import_statement = core_config['shell']['import_statement']
+    if shell_import_statement:
+        try:
+            engine_service.execute(shell_import_statement)
+        except:
+            log.msg("Error running import_statement: %s" % sis)
+    
+    # Create the service hierarchy
+    main_service = service.MultiService()
+    engine_service.setServiceParent(main_service)
+    tub_service = Tub()
+    tub_service.setServiceParent(main_service)
+    # This needs to be called before the connection is initiated
+    main_service.startService()
+    
+    # This initiates the connection to the controller and calls
+    # register_engine to tell the controller we are ready to do work
+    engine_connector = EngineConnector(tub_service)
+    furl_file = kernel_config['engine']['furl_file']
+    d = engine_connector.connect_to_controller(engine_service, furl_file)
+    d.addErrback(lambda _: reactor.stop())
+    
+    reactor.run()
+
+
+def init_config():
+    """
+    Initialize the configuration using default and command line options.
+    """
+    
+    parser = OptionParser()
+    
+    parser.add_option(
+        "--furl-file",
+        type="string", 
+        dest="furl_file",
+        help="The filename containing the FURL of the controller"
+    )
+    parser.add_option(
+        "--mpi",
+        type="string",
+        dest="mpi",
+        help="How to enable MPI (mpi4py, pytrilinos, or empty string to disable)"
+    )
+    parser.add_option(
+        "-l",
+        "--logfile",
+        type="string",
+        dest="logfile",
+        help="log file name (default is stdout)"
+    )
+    parser.add_option(
+        "--ipythondir",
+        type="string",
+        dest="ipythondir",
+        help="look for config files and profiles in this directory"
+    )
+    
+    (options, args) = parser.parse_args()
+    
+    kernel_config_manager.update_config_obj_from_default_file(options.ipythondir)
+    core_config_manager.update_config_obj_from_default_file(options.ipythondir)
+    
+    kernel_config = kernel_config_manager.get_config_obj()
+    # Now override with command line options
+    if options.furl_file is not None:
+        kernel_config['engine']['furl_file'] = options.furl_file
+    if options.logfile is not None:
+        kernel_config['engine']['logfile'] = options.logfile
+    if options.mpi is not None:
+        kernel_config['mpi']['default'] = options.mpi
+
+
+def main():
+    """
+    After creating the configuration information, start the engine.
+    """
+    init_config()
+    start_engine()
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/IPython/kernel/task.py b/IPython/kernel/task.py
new file mode 100644
index 0000000..18ecc6d
--- /dev/null
+++ b/IPython/kernel/task.py
@@ -0,0 +1,799 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.tests.test_task -*-
+
+"""Task farming representation of the ControllerService."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import copy, time
+from types import FunctionType as function
+
+import zope.interface as zi, string
+from twisted.internet import defer, reactor
+from twisted.python import components, log, failure
+
+# from IPython.genutils import time
+
+from IPython.kernel import engineservice as es, error
+from IPython.kernel import controllerservice as cs
+from IPython.kernel.twistedutil import gatherBoth, DeferredList
+
+from IPython.kernel.pickleutil import can,uncan, CannedFunction
+
+def canTask(task):
+    t = copy.copy(task)
+    t.depend = can(t.depend)
+    if t.recovery_task:
+        t.recovery_task = canTask(t.recovery_task)
+    return t
+
+def uncanTask(task):
+    t = copy.copy(task)
+    t.depend = uncan(t.depend)
+    if t.recovery_task and t.recovery_task is not task:
+        t.recovery_task = uncanTask(t.recovery_task)
+    return t
+
+time_format = '%Y/%m/%d %H:%M:%S'
+
+class Task(object):
+    """Our representation of a task for the `TaskController` interface.
+
+    The user should create instances of this class to represent a task that 
+    needs to be done.
+    
+    :Parameters:
+        expression : str
+            A str that is valid python code that is the task.
+        pull : str or list of str 
+            The names of objects to be pulled as results.  If not specified, 
+            will return {'result', None}
+        push : dict
+            A dict of objects to be pushed into the engines namespace before
+            execution of the expression.
+        clear_before : boolean
+            Should the engine's namespace be cleared before the task is run.
+            Default=False.
+        clear_after : boolean 
+            Should the engine's namespace be cleared after the task is run.
+            Default=False.
+        retries : int
+            The number of times to resumbit the task if it fails.  Default=0.
+        recovery_task : Task
+            This is the Task to be run when the task has exhausted its retries
+            Default=None.
+        depend : bool function(properties)
+            This is the dependency function for the Task, which determines
+            whether a task can be run on a Worker.  `depend` is called with
+            one argument, the worker's properties dict, and should return
+            True if the worker meets the dependencies or False if it does
+            not.
+            Default=None - run on any worker
+        options : dict
+            Any other keyword options for more elaborate uses of tasks
+    
+    Examples
+    --------
+    
+    >>> t = Task('dostuff(args)')
+    >>> t = Task('a=5', pull='a')
+    >>> t = Task('a=5\nb=4', pull=['a','b'])
+    >>> t = Task('os.kill(os.getpid(),9)', retries=100) # this is a bad idea
+        # A dependency case:
+    >>> def hasMPI(props):
+    ...     return props.get('mpi') is not None
+    >>> t = Task('mpi.send(blah,blah)', depend = hasMPI)
+    """
+    
+    def __init__(self, expression, pull=None, push=None,
+            clear_before=False, clear_after=False, retries=0, 
+            recovery_task=None, depend=None, **options):
+        self.expression = expression
+        if isinstance(pull, str):
+            self.pull = [pull]
+        else:
+            self.pull = pull
+        self.push = push
+        self.clear_before = clear_before
+        self.clear_after = clear_after
+        self.retries=retries
+        self.recovery_task = recovery_task
+        self.depend = depend
+        self.options = options
+        self.taskid = None
+
+class ResultNS:
+    """The result namespace object for use in TaskResult objects as tr.ns.
+    It builds an object from a dictionary, such that it has attributes
+    according to the key,value pairs of the dictionary.
+    
+    This works by calling setattr on ALL key,value pairs in the dict.  If a user
+    chooses to overwrite the `__repr__` or `__getattr__` attributes, they can.
+    This can be a bad idea, as it may corrupt standard behavior of the
+    ns object.
+    
+    Example
+    --------
+    
+    >>> ns = ResultNS({'a':17,'foo':range(3)})
+    >>> print ns
+        NS{'a':17,'foo':range(3)}
+    >>> ns.a
+        17
+    >>> ns['foo']
+        [0,1,2]
+    """
+    def __init__(self, dikt):
+        for k,v in dikt.iteritems():
+            setattr(self,k,v)
+    
+    def __repr__(self):
+        l = dir(self)
+        d = {}
+        for k in l:
+            # do not print private objects
+            if k[:2] != '__' and k[-2:] != '__':
+                d[k] = getattr(self, k)
+        return "NS"+repr(d)
+    
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+class TaskResult(object):
+    """
+    An object for returning task results.
+        
+    This object encapsulates the results of a task.  On task
+    success it will have a keys attribute that will have a list
+    of the variables that have been pulled back.  These variables
+    are accessible as attributes of this class as well.  On 
+    success the failure attribute will be None.
+        
+    In task failure, keys will be empty, but failure will contain
+    the failure object that encapsulates the remote exception.
+    One can also simply call the raiseException() method of 
+    this class to re-raise any remote exception in the local
+    session.
+        
+    The TaskResult has a .ns member, which is a property for access
+    to the results.  If the Task had pull=['a', 'b'], then the 
+    Task Result will have attributes tr.ns.a, tr.ns.b for those values.
+    Accessing tr.ns will raise the remote failure if the task failed.
+        
+    The engineid attribute should have the engineid of the engine
+    that ran the task.  But, because engines can come and go in
+    the ipython task system, the engineid may not continue to be
+    valid or accurate.
+        
+    The taskid attribute simply gives the taskid that the task
+    is tracked under.
+    """
+    taskid = None
+    
+    def _getNS(self):
+        if isinstance(self.failure, failure.Failure):
+            return self.failure.raiseException()
+        else:
+            return self._ns
+    
+    def _setNS(self, v):
+        raise Exception("I am protected!")
+    
+    ns = property(_getNS, _setNS)
+    
+    def __init__(self, results, engineid):
+        self.engineid = engineid
+        if isinstance(results, failure.Failure):
+            self.failure = results
+            self.results = {}
+        else:
+            self.results = results
+            self.failure = None
+        
+        self._ns = ResultNS(self.results)
+        
+        self.keys = self.results.keys()
+    
+    def __repr__(self):
+        if self.failure is not None:
+            contents = self.failure
+        else:
+            contents = self.results
+        return "TaskResult[ID:%r]:%r"%(self.taskid, contents)
+    
+    def __getitem__(self, key):
+        if self.failure is not None:
+            self.raiseException()
+        return self.results[key]
+    
+    def raiseException(self):
+        """Re-raise any remote exceptions in the local python session."""
+        if self.failure is not None:
+            self.failure.raiseException()
+
+
+class IWorker(zi.Interface):
+    """The Basic Worker Interface. 
+    
+    A worked is a representation of an Engine that is ready to run tasks.
+    """
+    
+    zi.Attribute("workerid", "the id of the worker")
+    
+    def run(task):
+        """Run task in worker's namespace.
+        
+        :Parameters:
+            task : a `Task` object
+        
+        :Returns: `Deferred` to a `TaskResult` object.
+        """
+
+
+class WorkerFromQueuedEngine(object):
+    """Adapt an `IQueuedEngine` to an `IWorker` object"""
+    zi.implements(IWorker)
+    
+    def __init__(self, qe):
+        self.queuedEngine = qe
+        self.workerid = None
+    
+    def _get_properties(self):
+        return self.queuedEngine.properties
+    
+    properties = property(_get_properties, lambda self, _:None)
+    
+    def run(self, task):
+        """Run task in worker's namespace.
+        
+        :Parameters:
+            task : a `Task` object
+        
+        :Returns: `Deferred` to a `TaskResult` object.
+        """
+        if task.clear_before:
+            d = self.queuedEngine.reset()
+        else:
+            d = defer.succeed(None)
+            
+        if task.push is not None:
+            d.addCallback(lambda r: self.queuedEngine.push(task.push))
+        
+        d.addCallback(lambda r: self.queuedEngine.execute(task.expression))
+        
+        if task.pull is not None:
+            d.addCallback(lambda r: self.queuedEngine.pull(task.pull))
+        else:
+            d.addCallback(lambda r: None)
+        
+        def reseter(result):
+            self.queuedEngine.reset()
+            return result
+            
+        if task.clear_after:
+            d.addBoth(reseter)
+        
+        return d.addBoth(self._zipResults, task.pull, time.time(), time.localtime())
+    
+    def _zipResults(self, result, names, start, start_struct):
+        """Callback for construting the TaskResult object."""
+        if isinstance(result, failure.Failure):
+            tr = TaskResult(result, self.queuedEngine.id)
+        else:
+            if names is None:
+                resultDict = {} 
+            elif len(names) == 1:
+                resultDict = {names[0]:result}
+            else:
+                resultDict = dict(zip(names, result))
+            tr = TaskResult(resultDict, self.queuedEngine.id)
+        # the time info
+        tr.submitted = time.strftime(time_format, start_struct)
+        tr.completed = time.strftime(time_format)
+        tr.duration = time.time()-start
+        return tr
+    
+
+components.registerAdapter(WorkerFromQueuedEngine, es.IEngineQueued, IWorker)
+
+class IScheduler(zi.Interface):
+    """The interface for a Scheduler.
+    """
+    zi.Attribute("nworkers", "the number of unassigned workers")
+    zi.Attribute("ntasks", "the number of unscheduled tasks")
+    zi.Attribute("workerids", "a list of the worker ids")
+    zi.Attribute("taskids", "a list of the task ids")
+    
+    def add_task(task, **flags):
+        """Add a task to the queue of the Scheduler.
+        
+        :Parameters:
+            task : a `Task` object
+                The task to be queued.
+            flags : dict
+                General keywords for more sophisticated scheduling
+        """
+    
+    def pop_task(id=None):
+        """Pops a Task object.
+        
+        This gets the next task to be run.  If no `id` is requested, the highest priority
+        task is returned.
+        
+        :Parameters:
+            id
+                The id of the task to be popped.  The default (None) is to return 
+                the highest priority task.
+                
+        :Returns: a `Task` object
+        
+        :Exceptions:
+            IndexError : raised if no taskid in queue
+        """
+    
+    def add_worker(worker, **flags):
+        """Add a worker to the worker queue.
+        
+        :Parameters:
+            worker : an IWorker implementing object
+            flags : General keywords for more sophisticated scheduling
+        """
+    
+    def pop_worker(id=None):
+        """Pops an IWorker object that is ready to do work.
+        
+        This gets the next IWorker that is ready to do work. 
+        
+        :Parameters:
+            id : if specified, will pop worker with workerid=id, else pops
+                 highest priority worker.  Defaults to None.
+        
+        :Returns:
+            an IWorker object
+        
+        :Exceptions:
+            IndexError : raised if no workerid in queue
+        """
+    
+    def ready():
+        """Returns True if there is something to do, False otherwise"""
+    
+    def schedule():
+        """Returns a tuple of the worker and task pair for the next
+        task to be run.
+        """
+    
+
+class FIFOScheduler(object):
+    """A basic First-In-First-Out (Queue) Scheduler.
+    This is the default Scheduler for the TaskController.
+    See the docstrings for IScheduler for interface details.
+    """
+    
+    zi.implements(IScheduler)
+    
+    def __init__(self):
+        self.tasks = []
+        self.workers = []
+    
+    def _ntasks(self):
+        return len(self.tasks)
+    
+    def _nworkers(self):
+        return len(self.workers)
+    
+    ntasks = property(_ntasks, lambda self, _:None)
+    nworkers = property(_nworkers, lambda self, _:None)
+    
+    def _taskids(self):
+        return [t.taskid for t in self.tasks]
+    
+    def _workerids(self):
+        return [w.workerid for w in self.workers]
+    
+    taskids = property(_taskids, lambda self,_:None)
+    workerids = property(_workerids, lambda self,_:None)
+    
+    def add_task(self, task, **flags):    
+        self.tasks.append(task)
+    
+    def pop_task(self, id=None):
+        if id is None:
+            return self.tasks.pop(0)
+        else:
+            for i in range(len(self.tasks)):
+                taskid = self.tasks[i].taskid
+                if id == taskid:
+                    return self.tasks.pop(i)
+            raise IndexError("No task #%i"%id)
+    
+    def add_worker(self, worker, **flags):
+        self.workers.append(worker)
+    
+    def pop_worker(self, id=None):
+        if id is None:
+            return self.workers.pop(0)
+        else:
+            for i in range(len(self.workers)):
+                workerid = self.workers[i].workerid
+                if id == workerid:
+                    return self.workers.pop(i)
+            raise IndexError("No worker #%i"%id)
+    
+    def schedule(self):
+        for t in self.tasks:
+            for w in self.workers:
+                try:# do not allow exceptions to break this
+                    cando = t.depend is None or t.depend(w.properties)
+                except:
+                    cando = False
+                if cando:
+                    return self.pop_worker(w.workerid), self.pop_task(t.taskid)
+        return None, None
+    
+
+
+class LIFOScheduler(FIFOScheduler):
+    """A Last-In-First-Out (Stack) Scheduler.  This scheduler should naively
+    reward fast engines by giving them more jobs.  This risks starvation, but
+    only in cases with low load, where starvation does not really matter.
+    """
+    
+    def add_task(self, task, **flags):
+        # self.tasks.reverse()
+        self.tasks.insert(0, task)
+        # self.tasks.reverse()
+    
+    def add_worker(self, worker, **flags):
+        # self.workers.reverse()
+        self.workers.insert(0, worker)
+        # self.workers.reverse()
+    
+
+class ITaskController(cs.IControllerBase):
+    """The Task based interface to a `ControllerService` object
+    
+    This adapts a `ControllerService` to the ITaskController interface.
+    """
+    
+    def run(task):
+        """Run a task.
+        
+        :Parameters:
+            task : an IPython `Task` object
+        
+        :Returns: the integer ID of the task
+        """
+    
+    def get_task_result(taskid, block=False):
+        """Get the result of a task by its ID.
+        
+        :Parameters:
+            taskid : int
+                the id of the task whose result is requested
+        
+        :Returns: `Deferred` to (taskid, actualResult) if the task is done, and None
+            if not.
+        
+        :Exceptions:
+            actualResult will be an `IndexError` if no such task has been submitted
+        """
+    
+    def abort(taskid):
+        """Remove task from queue if task is has not been submitted.
+        
+        If the task has already been submitted, wait for it to finish and discard 
+        results and prevent resubmission.
+        
+        :Parameters:
+            taskid : the id of the task to be aborted
+        
+        :Returns:
+            `Deferred` to abort attempt completion.  Will be None on success.
+        
+        :Exceptions:
+            deferred will fail with `IndexError` if no such task has been submitted
+            or the task has already completed.
+        """
+    
+    def barrier(taskids):
+        """Block until the list of taskids are completed.
+        
+        Returns None on success.
+        """
+    
+    def spin():
+        """touch the scheduler, to resume scheduling without submitting
+        a task.
+        """
+    
+    def queue_status(self, verbose=False):
+        """Get a dictionary with the current state of the task queue.
+        
+        If verbose is True, then return lists of taskids, otherwise, 
+        return the number of tasks with each status.
+        """
+    
+
+class TaskController(cs.ControllerAdapterBase):
+    """The Task based interface to a Controller object.
+    
+    If you want to use a different scheduler, just subclass this and set
+    the `SchedulerClass` member to the *class* of your chosen scheduler.
+    """
+    
+    zi.implements(ITaskController)
+    SchedulerClass = FIFOScheduler
+    
+    timeout = 30
+    
+    def __init__(self, controller):
+        self.controller = controller
+        self.controller.on_register_engine_do(self.registerWorker, True)
+        self.controller.on_unregister_engine_do(self.unregisterWorker, True)
+        self.taskid = 0
+        self.failurePenalty = 1 # the time in seconds to penalize
+                                # a worker for failing a task
+        self.pendingTasks = {} # dict of {workerid:(taskid, task)}
+        self.deferredResults = {} # dict of {taskid:deferred}
+        self.finishedResults = {} # dict of {taskid:actualResult}
+        self.workers = {} # dict of {workerid:worker}
+        self.abortPending = [] # dict of {taskid:abortDeferred}
+        self.idleLater = None # delayed call object for timeout
+        self.scheduler = self.SchedulerClass()
+        
+        for id in self.controller.engines.keys():
+                self.workers[id] = IWorker(self.controller.engines[id])
+                self.workers[id].workerid = id
+                self.schedule.add_worker(self.workers[id])
+    
+    def registerWorker(self, id):
+        """Called by controller.register_engine."""
+        if self.workers.get(id):
+            raise "We already have one!  This should not happen."
+        self.workers[id] = IWorker(self.controller.engines[id])
+        self.workers[id].workerid = id
+        if not self.pendingTasks.has_key(id):# if not working
+            self.scheduler.add_worker(self.workers[id])
+        self.distributeTasks()
+    
+    def unregisterWorker(self, id):
+        """Called by controller.unregister_engine"""
+        
+        if self.workers.has_key(id):
+            try:
+                self.scheduler.pop_worker(id)
+            except IndexError:
+                pass
+            self.workers.pop(id)
+    
+    def _pendingTaskIDs(self):
+        return [t.taskid for t in self.pendingTasks.values()]
+    
+    #---------------------------------------------------------------------------
+    # Interface methods
+    #---------------------------------------------------------------------------
+    
+    def run(self, task):
+        """Run a task and return `Deferred` to its taskid."""
+        task.taskid = self.taskid
+        task.start = time.localtime()
+        self.taskid += 1
+        d = defer.Deferred()
+        self.scheduler.add_task(task)
+        # log.msg('Queuing task: %i' % task.taskid)
+        
+        self.deferredResults[task.taskid] = []
+        self.distributeTasks()
+        return defer.succeed(task.taskid)
+    
+    def get_task_result(self, taskid, block=False):
+        """Returns a `Deferred` to a TaskResult tuple or None."""
+        # log.msg("Getting task result: %i" % taskid)
+        if self.finishedResults.has_key(taskid):
+            tr = self.finishedResults[taskid]
+            return defer.succeed(tr)
+        elif self.deferredResults.has_key(taskid):
+            if block:
+                d = defer.Deferred()
+                self.deferredResults[taskid].append(d)
+                return d
+            else:
+                return defer.succeed(None)
+        else:
+            return defer.fail(IndexError("task ID not registered: %r" % taskid))
+    
+    def abort(self, taskid):
+        """Remove a task from the queue if it has not been run already."""
+        if not isinstance(taskid, int):
+            return defer.fail(failure.Failure(TypeError("an integer task id expected: %r" % taskid)))
+        try:
+            self.scheduler.pop_task(taskid)
+        except IndexError, e:
+            if taskid in self.finishedResults.keys():
+                d = defer.fail(IndexError("Task Already Completed"))
+            elif taskid in self.abortPending:
+                d = defer.fail(IndexError("Task Already Aborted"))
+            elif taskid in self._pendingTaskIDs():# task is pending
+                self.abortPending.append(taskid)
+                d = defer.succeed(None)
+            else:
+                d = defer.fail(e)
+        else:
+            d = defer.execute(self._doAbort, taskid)
+        
+        return d
+    
+    def barrier(self, taskids):
+        dList = []
+        if isinstance(taskids, int):
+            taskids = [taskids]
+        for id in taskids:
+            d = self.get_task_result(id, block=True)
+            dList.append(d)
+        d = DeferredList(dList, consumeErrors=1)
+        d.addCallbacks(lambda r: None)
+        return d
+    
+    def spin(self):
+        return defer.succeed(self.distributeTasks())
+    
+    def queue_status(self, verbose=False):
+        pending = self._pendingTaskIDs()
+        failed = []
+        succeeded = []
+        for k,v in self.finishedResults.iteritems():
+            if not isinstance(v, failure.Failure):
+                if hasattr(v,'failure'):
+                    if v.failure is None:
+                        succeeded.append(k)
+                    else:
+                        failed.append(k)
+        scheduled = self.scheduler.taskids
+        if verbose:
+            result = dict(pending=pending, failed=failed, 
+                succeeded=succeeded, scheduled=scheduled)
+        else:
+            result = dict(pending=len(pending),failed=len(failed),
+                succeeded=len(succeeded),scheduled=len(scheduled))
+        return defer.succeed(result)
+    
+    #---------------------------------------------------------------------------
+    # Queue methods
+    #---------------------------------------------------------------------------
+    
+    def _doAbort(self, taskid):
+        """Helper function for aborting a pending task."""
+        # log.msg("Task aborted: %i" % taskid)
+        result = failure.Failure(error.TaskAborted())
+        self._finishTask(taskid, result)
+        if taskid in self.abortPending:
+            self.abortPending.remove(taskid)
+    
+    def _finishTask(self, taskid, result):
+        dlist = self.deferredResults.pop(taskid)
+        result.taskid = taskid   # The TaskResult should save the taskid
+        self.finishedResults[taskid] = result
+        for d in dlist:
+            d.callback(result)
+    
+    def distributeTasks(self):
+        """Distribute tasks while self.scheduler has things to do."""
+        # log.msg("distributing Tasks")
+        worker, task = self.scheduler.schedule()
+        if not worker and not task:
+            if self.idleLater and self.idleLater.called:# we are inside failIdle
+                self.idleLater = None
+            else:
+                self.checkIdle()
+            return False
+        # else something to do:
+        while worker and task:
+            # get worker and task
+            # add to pending
+            self.pendingTasks[worker.workerid] = task
+            # run/link callbacks
+            d = worker.run(task)
+            # log.msg("Running task %i on worker %i" %(task.taskid, worker.workerid))
+            d.addBoth(self.taskCompleted, task.taskid, worker.workerid)
+            worker, task = self.scheduler.schedule()
+        # check for idle timeout:
+        self.checkIdle()
+        return True
+    
+    def checkIdle(self):
+        if self.idleLater and not self.idleLater.called:
+            self.idleLater.cancel()
+        if self.scheduler.ntasks and self.workers and \
+                    self.scheduler.nworkers == len(self.workers):
+            self.idleLater = reactor.callLater(self.timeout, self.failIdle)
+        else:
+            self.idleLater = None
+    
+    def failIdle(self):
+        if not self.distributeTasks():
+            while self.scheduler.ntasks:
+                t = self.scheduler.pop_task()
+                msg = "task %i failed to execute due to unmet dependencies"%t.taskid
+                msg += " for %i seconds"%self.timeout
+                # log.msg("Task aborted by timeout: %i" % t.taskid)
+                f = failure.Failure(error.TaskTimeout(msg))
+                self._finishTask(t.taskid, f)
+        self.idleLater = None
+                
+    
+    def taskCompleted(self, result, taskid, workerid):
+        """This is the err/callback for a completed task."""
+        try:
+            task = self.pendingTasks.pop(workerid)
+        except:
+            # this should not happen
+            log.msg("Tried to pop bad pending task %i from worker %i"%(taskid, workerid))
+            log.msg("Result: %r"%result)
+            log.msg("Pending tasks: %s"%self.pendingTasks)
+            return
+        
+        # Check if aborted while pending
+        aborted = False
+        if taskid in self.abortPending:
+            self._doAbort(taskid)
+            aborted = True
+        
+        if not aborted:
+            if result.failure is not None and isinstance(result.failure, failure.Failure): # we failed
+                log.msg("Task %i failed on worker %i"% (taskid, workerid))
+                if task.retries > 0: # resubmit
+                    task.retries -= 1
+                    self.scheduler.add_task(task)
+                    s = "Resubmitting task %i, %i retries remaining" %(taskid, task.retries)
+                    log.msg(s)
+                    self.distributeTasks()
+                elif isinstance(task.recovery_task, Task) and \
+                                    task.recovery_task.retries > -1:
+                    # retries = -1 is to prevent infinite recovery_task loop
+                    task.retries = -1 
+                    task.recovery_task.taskid = taskid
+                    task = task.recovery_task
+                    self.scheduler.add_task(task)
+                    s = "Recovering task %i, %i retries remaining" %(taskid, task.retries)
+                    log.msg(s)
+                    self.distributeTasks()
+                else: # done trying
+                    self._finishTask(taskid, result)
+                # wait a second before readmitting a worker that failed
+                # it may have died, and not yet been unregistered
+                reactor.callLater(self.failurePenalty, self.readmitWorker, workerid)
+            else: # we succeeded
+                # log.msg("Task completed: %i"% taskid)
+                self._finishTask(taskid, result)
+                self.readmitWorker(workerid)
+        else:# we aborted the task
+            if result.failure is not None and isinstance(result.failure, failure.Failure): # it failed, penalize worker
+                reactor.callLater(self.failurePenalty, self.readmitWorker, workerid)
+            else:
+                self.readmitWorker(workerid)
+    
+    def readmitWorker(self, workerid):
+        """Readmit a worker to the scheduler.  
+        
+        This is outside `taskCompleted` because of the `failurePenalty` being 
+        implemented through `reactor.callLater`.
+        """
+        
+        if workerid in self.workers.keys() and workerid not in self.pendingTasks.keys():
+            self.scheduler.add_worker(self.workers[workerid])
+            self.distributeTasks()
+        
+    
+components.registerAdapter(TaskController, cs.IControllerBase, ITaskController)
diff --git a/IPython/kernel/taskclient.py b/IPython/kernel/taskclient.py
new file mode 100644
index 0000000..405407a
--- /dev/null
+++ b/IPython/kernel/taskclient.py
@@ -0,0 +1,161 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.tests.test_taskcontrollerxmlrpc -*-
+
+"""The Generic Task Client object.  
+
+This must be subclassed based on your connection method.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from zope.interface import Interface, implements
+from twisted.python import components, log
+
+from IPython.kernel.twistedutil import blockingCallFromThread
+from IPython.kernel import task, error
+
+#-------------------------------------------------------------------------------
+# Connecting Task Client
+#-------------------------------------------------------------------------------
+
+class InteractiveTaskClient(object):
+    
+    def irun(self, *args, **kwargs):
+        """Run a task on the `TaskController`.
+        
+        This method is a shorthand for run(task) and its arguments are simply
+        passed onto a `Task` object:
+        
+        irun(*args, **kwargs) -> run(Task(*args, **kwargs))
+
+        :Parameters:
+            expression : str
+                A str that is valid python code that is the task.
+            pull : str or list of str 
+                The names of objects to be pulled as results.
+            push : dict
+                A dict of objects to be pushed into the engines namespace before
+                execution of the expression.
+            clear_before : boolean
+                Should the engine's namespace be cleared before the task is run.
+                Default=False.
+            clear_after : boolean 
+                Should the engine's namespace be cleared after the task is run.
+                Default=False.
+            retries : int
+                The number of times to resumbit the task if it fails.  Default=0.
+            options : dict
+                Any other keyword options for more elaborate uses of tasks
+            
+        :Returns: A `TaskResult` object.      
+        """
+        block = kwargs.pop('block', False)
+        if len(args) == 1 and isinstance(args[0], task.Task):
+            t = args[0]
+        else:
+            t = task.Task(*args, **kwargs)
+        taskid = self.run(t)
+        print "TaskID = %i"%taskid
+        if block:
+            return self.get_task_result(taskid, block)
+        else:
+            return taskid
+
+class IBlockingTaskClient(Interface):
+    """
+    An interface for blocking task clients.
+    """
+    pass
+
+
+class BlockingTaskClient(InteractiveTaskClient):
+    """
+    This class provides a blocking task client.
+    """
+    
+    implements(IBlockingTaskClient)
+    
+    def __init__(self, task_controller):
+        self.task_controller = task_controller
+        self.block = True
+        
+    def run(self, task):
+        """
+        Run a task and return a task id that can be used to get the task result.
+        
+        :Parameters:
+            task : `Task`
+                The `Task` object to run
+        """
+        return blockingCallFromThread(self.task_controller.run, task)
+    
+    def get_task_result(self, taskid, block=False):
+        """
+        Get or poll for a task result.
+        
+        :Parameters:
+            taskid : int
+                The id of the task whose result to get
+            block : boolean
+                If True, wait until the task is done and then result the
+                `TaskResult` object.  If False, just poll for the result and
+                return None if the task is not done.
+        """
+        return blockingCallFromThread(self.task_controller.get_task_result,
+            taskid, block)
+    
+    def abort(self, taskid):
+        """
+        Abort a task by task id if it has not been started.
+        """
+        return blockingCallFromThread(self.task_controller.abort, taskid)
+    
+    def barrier(self, taskids):
+        """
+        Wait for a set of tasks to finish.
+        
+        :Parameters:
+            taskids : list of ints
+                A list of task ids to wait for.
+        """
+        return blockingCallFromThread(self.task_controller.barrier, taskids)
+    
+    def spin(self):
+        """
+        Cause the scheduler to schedule tasks.
+        
+        This method only needs to be called in unusual situations where the
+        scheduler is idle for some reason.
+        """
+        return blockingCallFromThread(self.task_controller.spin)
+    
+    def queue_status(self, verbose=False):
+        """
+        Get a dictionary with the current state of the task queue.
+        
+        :Parameters:
+            verbose : boolean
+                If True, return a list of taskids.  If False, simply give
+                the number of tasks with each status.
+        
+        :Returns:
+            A dict with the queue status.
+        """
+        return blockingCallFromThread(self.task_controller.queue_status, verbose)
+
+
+components.registerAdapter(BlockingTaskClient,
+            task.ITaskController, IBlockingTaskClient)
+
+
diff --git a/IPython/kernel/taskfc.py b/IPython/kernel/taskfc.py
new file mode 100644
index 0000000..b4096e7
--- /dev/null
+++ b/IPython/kernel/taskfc.py
@@ -0,0 +1,267 @@
+# encoding: utf-8
+# -*- test-case-name: IPython.kernel.tests.test_taskxmlrpc -*-
+"""A Foolscap interface to a TaskController.
+
+This class lets Foolscap clients talk to a TaskController.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import cPickle as pickle
+import xmlrpclib, copy
+
+from zope.interface import Interface, implements
+from twisted.internet import defer
+from twisted.python import components, failure
+
+from foolscap import Referenceable
+
+from IPython.kernel.twistedutil import blockingCallFromThread
+from IPython.kernel import error, task as taskmodule, taskclient
+from IPython.kernel.pickleutil import can, uncan
+from IPython.kernel.clientinterfaces import (
+    IFCClientInterfaceProvider, 
+    IBlockingClientAdaptor
+)
+
+#-------------------------------------------------------------------------------
+# The Controller side of things
+#-------------------------------------------------------------------------------
+
+
+class IFCTaskController(Interface):
+    """Foolscap interface to task controller.
+        
+    See the documentation of ITaskController for documentation about the methods.
+    """
+    def remote_run(request, binTask):
+        """"""
+    
+    def remote_abort(request, taskid):
+        """"""
+        
+    def remote_get_task_result(request, taskid, block=False):
+        """"""
+        
+    def remote_barrier(request, taskids):
+        """"""
+    
+    def remote_spin(request):
+        """"""
+    
+    def remote_queue_status(request, verbose):
+        """"""
+
+
+class FCTaskControllerFromTaskController(Referenceable):
+    """XML-RPC attachmeot for controller.
+        
+    See IXMLRPCTaskController and ITaskController (and its children) for documentation. 
+    """
+    implements(IFCTaskController, IFCClientInterfaceProvider)
+    
+    def __init__(self, taskController):
+        self.taskController = taskController
+    
+    #---------------------------------------------------------------------------
+    # Non interface methods
+    #---------------------------------------------------------------------------
+    
+    def packageFailure(self, f):
+        f.cleanFailure()
+        return self.packageSuccess(f)
+    
+    def packageSuccess(self, obj):
+        serial = pickle.dumps(obj, 2)
+        return serial
+    
+    #---------------------------------------------------------------------------
+    # ITaskController related methods
+    #---------------------------------------------------------------------------
+    
+    def remote_run(self, ptask):
+        try:
+            ctask = pickle.loads(ptask)
+            task = taskmodule.uncanTask(ctask)
+        except:
+            d = defer.fail(pickle.UnpickleableError("Could not unmarshal task"))
+        else:
+            d = self.taskController.run(task)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d
+    
+    def remote_abort(self, taskid):
+        d = self.taskController.abort(taskid)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d
+    
+    def remote_get_task_result(self, taskid, block=False):
+        d = self.taskController.get_task_result(taskid, block)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d
+    
+    def remote_barrier(self, taskids):
+        d = self.taskController.barrier(taskids)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d        
+    
+    def remote_spin(self):
+        d = self.taskController.spin()
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d        
+    
+    def remote_queue_status(self, verbose):
+        d = self.taskController.queue_status(verbose)
+        d.addCallback(self.packageSuccess)
+        d.addErrback(self.packageFailure)
+        return d
+    
+    def remote_get_client_name(self):
+        return 'IPython.kernel.taskfc.FCTaskClient'
+    
+components.registerAdapter(FCTaskControllerFromTaskController,
+            taskmodule.ITaskController, IFCTaskController)
+
+
+#-------------------------------------------------------------------------------
+# The Client side of things
+#-------------------------------------------------------------------------------
+
+class FCTaskClient(object):
+    """XML-RPC based TaskController client that implements ITaskController.
+        
+    :Parameters:
+        addr : (ip, port)
+            The ip (str) and port (int) tuple of the `TaskController`.  
+    """
+    implements(taskmodule.ITaskController, IBlockingClientAdaptor)
+    
+    def __init__(self, remote_reference):
+        self.remote_reference = remote_reference
+    
+    #---------------------------------------------------------------------------
+    # Non interface methods
+    #---------------------------------------------------------------------------
+    
+    def unpackage(self, r):
+        return pickle.loads(r)
+    
+    #---------------------------------------------------------------------------
+    # ITaskController related methods
+    #---------------------------------------------------------------------------
+    def run(self, task):
+        """Run a task on the `TaskController`.
+        
+        :Parameters:
+            task : a `Task` object
+        
+        The Task object is created using the following signature:
+        
+        Task(expression, pull=None, push={}, clear_before=False, 
+            clear_after=False, retries=0, **options):)
+        
+        The meaning of the arguments is as follows:
+        
+        :Task Parameters:
+            expression : str
+                A str that is valid python code that is the task.
+            pull : str or list of str 
+                The names of objects to be pulled as results.
+            push : dict
+                A dict of objects to be pushed into the engines namespace before
+                execution of the expression.
+            clear_before : boolean
+                Should the engine's namespace be cleared before the task is run.
+                Default=False.
+            clear_after : boolean 
+                Should the engine's namespace be cleared after the task is run.
+                Default=False.
+            retries : int
+                The number of times to resumbit the task if it fails.  Default=0.
+            options : dict
+                Any other keyword options for more elaborate uses of tasks
+            
+        :Returns: The int taskid of the submitted task.  Pass this to 
+            `get_task_result` to get the `TaskResult` object.
+        """
+        assert isinstance(task, taskmodule.Task), "task must be a Task object!"
+        ctask = taskmodule.canTask(task) # handles arbitrary function in .depend
+                                # as well as arbitrary recovery_task chains
+        ptask = pickle.dumps(ctask, 2)
+        d = self.remote_reference.callRemote('run', ptask)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def get_task_result(self, taskid, block=False):
+        """The task result by taskid.
+        
+        :Parameters:
+            taskid : int
+                The taskid of the task to be retrieved.
+            block : boolean
+                Should I block until the task is done?
+        
+        :Returns: A `TaskResult` object that encapsulates the task result.
+        """
+        d = self.remote_reference.callRemote('get_task_result', taskid, block)
+        d.addCallback(self.unpackage)
+        return d 
+    
+    def abort(self, taskid):
+        """Abort a task by taskid.
+        
+        :Parameters:
+            taskid : int
+                The taskid of the task to be aborted.
+            block : boolean
+                Should I block until the task is aborted.        
+        """
+        d = self.remote_reference.callRemote('abort', taskid)
+        d.addCallback(self.unpackage)
+        return d 
+        
+    def barrier(self, taskids):
+        """Block until all tasks are completed.
+        
+        :Parameters:
+            taskids : list, tuple
+                A sequence of taskids to block on.
+        """
+        d = self.remote_reference.callRemote('barrier', taskids)
+        d.addCallback(self.unpackage)
+        return d 
+    
+    def spin(self):
+        """touch the scheduler, to resume scheduling without submitting
+        a task.
+        """
+        d = self.remote_reference.callRemote('spin')
+        d.addCallback(self.unpackage)
+        return d
+    
+    def queue_status(self, verbose=False):
+        """Return a dict with the status of the task queue."""
+        d = self.remote_reference.callRemote('queue_status', verbose)
+        d.addCallback(self.unpackage)
+        return d
+    
+    def adapt_to_blocking_client(self):
+        from IPython.kernel.taskclient import IBlockingTaskClient
+        return IBlockingTaskClient(self)
+
diff --git a/IPython/kernel/tests/__init__.py b/IPython/kernel/tests/__init__.py
new file mode 100644
index 0000000..bef7dcc
--- /dev/null
+++ b/IPython/kernel/tests/__init__.py
@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
diff --git a/IPython/kernel/tests/controllertest.py b/IPython/kernel/tests/controllertest.py
new file mode 100644
index 0000000..14df89c
--- /dev/null
+++ b/IPython/kernel/tests/controllertest.py
@@ -0,0 +1,102 @@
+# encoding: utf-8
+
+"""This file contains unittests for the kernel.engineservice.py module.
+
+Things that should be tested:
+
+ - Should the EngineService return Deferred objects?
+ - Run the same tests that are run in shell.py.
+ - Make sure that the Interface is really implemented.
+ - The startService and stopService methods.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+import zope.interface as zi
+
+from IPython.kernel import engineservice as es
+from IPython.kernel import error
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.controllerservice import \
+    IControllerCore
+
+
+class IControllerCoreTestCase(object):
+    """Tests for objects that implement IControllerCore.
+    
+    This test assumes that self.controller is defined and implements
+    IControllerCore.
+    """
+    
+    def testIControllerCoreInterface(self):
+        """Does self.engine claim to implement IEngineCore?"""
+        self.assert_(IControllerCore.providedBy(self.controller))
+        
+    def testIControllerCoreInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngireCore."""
+        for m in list(IControllerCore):
+            self.assert_(hasattr(self.controller, m))
+    
+    def testRegisterUnregisterEngine(self):
+        engine = es.EngineService()
+        qengine = es.QueuedEngine(engine)
+        regDict = self.controller.register_engine(qengine, 0)
+        self.assert_(isinstance(regDict, dict))
+        self.assert_(regDict.has_key('id'))
+        self.assert_(regDict['id']==0)
+        self.controller.unregister_engine(0)
+        self.assert_(self.controller.engines.get(0, None) == None)
+
+    def testRegisterUnregisterMultipleEngines(self):
+        e1 = es.EngineService()
+        qe1 = es.QueuedEngine(e1)
+        e2 = es.EngineService()
+        qe2 = es.QueuedEngine(e2)
+        rd1 = self.controller.register_engine(qe1, 0)
+        self.assertEquals(rd1['id'], 0)
+        rd2 = self.controller.register_engine(qe2, 1)
+        self.assertEquals(rd2['id'], 1)
+        self.controller.unregister_engine(0)
+        rd1 = self.controller.register_engine(qe1, 0)
+        self.assertEquals(rd1['id'], 0)
+        self.controller.unregister_engine(1)
+        rd2 = self.controller.register_engine(qe2, 0)
+        self.assertEquals(rd2['id'], 1)
+        self.controller.unregister_engine(0)
+        self.controller.unregister_engine(1)
+        self.assertEquals(self.controller.engines,{})
+        
+    def testRegisterCallables(self):
+        e1 = es.EngineService()
+        qe1 = es.QueuedEngine(e1)
+        self.registerCallableCalled = ';lkj'
+        self.unregisterCallableCalled = ';lkj'
+        self.controller.on_register_engine_do(self._registerCallable, False)
+        self.controller.on_unregister_engine_do(self._unregisterCallable, False)
+        self.controller.register_engine(qe1, 0)
+        self.assertEquals(self.registerCallableCalled, 'asdf')
+        self.controller.unregister_engine(0)
+        self.assertEquals(self.unregisterCallableCalled, 'asdf')
+        self.controller.on_register_engine_do_not(self._registerCallable)
+        self.controller.on_unregister_engine_do_not(self._unregisterCallable)
+            
+    def _registerCallable(self):
+        self.registerCallableCalled = 'asdf'
+        
+    def _unregisterCallable(self):
+        self.unregisterCallableCalled = 'asdf'
+        
+    def testBadUnregister(self):
+        self.assertRaises(AssertionError, self.controller.unregister_engine, 'foo')
\ No newline at end of file
diff --git a/IPython/kernel/tests/engineservicetest.py b/IPython/kernel/tests/engineservicetest.py
new file mode 100644
index 0000000..974ee12
--- /dev/null
+++ b/IPython/kernel/tests/engineservicetest.py
@@ -0,0 +1,373 @@
+# encoding: utf-8
+
+"""Test template for complete engine object"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import cPickle as pickle
+
+from twisted.internet import defer, reactor
+from twisted.python import failure
+from twisted.application import service
+import zope.interface as zi
+
+from IPython.kernel import newserialized
+from IPython.kernel import error
+from IPython.kernel.pickleutil import can, uncan
+import IPython.kernel.engineservice as es
+from IPython.kernel.core.interpreter import Interpreter
+from IPython.testutils.parametric import Parametric, parametric
+
+#-------------------------------------------------------------------------------
+# Tests
+#-------------------------------------------------------------------------------
+
+    
+# A sequence of valid commands run through execute
+validCommands = ['a=5',
+                 'b=10',
+                 'a=5; b=10; c=a+b',
+                 'import math; 2.0*math.pi',
+                 """def f():
+    result = 0.0
+    for i in range(10):
+        result += i
+""",
+                 'if 1<2: a=5',
+                 """import time
+time.sleep(0.1)""",
+                """from math import cos;
+x = 1.0*cos(0.5)""", # Semicolons lead to Discard ast nodes that should be discarded
+                """from sets import Set
+s = Set()
+   """, # Trailing whitespace should be allowed.
+                """import math
+math.cos(1.0)""", # Test a method call with a discarded return value
+                """x=1.0234
+a=5; b=10""", # Test an embedded semicolon
+                """x=1.0234
+a=5; b=10;""" # Test both an embedded and trailing semicolon
+                 ]
+                 
+# A sequence of commands that raise various exceptions
+invalidCommands = [('a=1/0',ZeroDivisionError),
+                   ('print v',NameError),
+                   ('l=[];l[0]',IndexError),
+                   ("d={};d['a']",KeyError),
+                   ("assert 1==0",AssertionError),
+                   ("import abababsdbfsbaljasdlja",ImportError),
+                   ("raise Exception()",Exception)]
+
+def testf(x):
+    return 2.0*x
+
+globala = 99
+
+def testg(x):
+    return  globala*x
+
+class IEngineCoreTestCase(object):
+    """Test an IEngineCore implementer."""
+
+    def createShell(self):
+        return Interpreter()
+
+    def catchQueueCleared(self, f):
+        try:
+            f.raiseException()
+        except error.QueueCleared:
+            pass
+        
+    def testIEngineCoreInterface(self):
+        """Does self.engine claim to implement IEngineCore?"""
+        self.assert_(es.IEngineCore.providedBy(self.engine))
+        
+    def testIEngineCoreInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngineCore."""
+        for m in list(es.IEngineCore):
+            self.assert_(hasattr(self.engine, m))
+    
+    def testIEngineCoreDeferreds(self):
+        d = self.engine.execute('a=5')
+        d.addCallback(lambda _: self.engine.pull('a'))
+        d.addCallback(lambda _: self.engine.get_result())
+        d.addCallback(lambda _: self.engine.keys())
+        d.addCallback(lambda _: self.engine.push(dict(a=10)))
+        return d
+    
+    def runTestExecute(self, cmd):
+        self.shell = Interpreter()
+        actual = self.shell.execute(cmd)
+        def compare(computed):
+            actual['id'] = computed['id']
+            self.assertEquals(actual, computed)
+        d = self.engine.execute(cmd)
+        d.addCallback(compare)
+        return d
+    
+    @parametric
+    def testExecute(cls):
+        return [(cls.runTestExecute, cmd) for cmd in validCommands]
+
+    def runTestExecuteFailures(self, cmd, exc):
+        def compare(f):
+            self.assertRaises(exc, f.raiseException)
+        d = self.engine.execute(cmd)
+        d.addErrback(compare)
+        return d
+    
+    @parametric
+    def testExecuteFailures(cls):
+        return [(cls.runTestExecuteFailures, cmd, exc) for cmd, exc in invalidCommands]
+    
+    def runTestPushPull(self, o):
+        d = self.engine.push(dict(a=o))
+        d.addCallback(lambda r: self.engine.pull('a'))
+        d.addCallback(lambda r: self.assertEquals(o,r))
+        return d
+    
+    @parametric
+    def testPushPull(cls):
+        objs = [10,"hi there",1.2342354,{"p":(1,2)},None]
+        return [(cls.runTestPushPull, o) for o in objs]
+        
+    def testPullNameError(self):
+        d = self.engine.push(dict(a=5))
+        d.addCallback(lambda _:self.engine.reset())
+        d.addCallback(lambda _: self.engine.pull("a"))
+        d.addErrback(lambda f: self.assertRaises(NameError, f.raiseException))
+        return d        
+    
+    def testPushPullFailures(self):
+        d = self.engine.pull('a')
+        d.addErrback(lambda f: self.assertRaises(NameError, f.raiseException))
+        d.addCallback(lambda _: self.engine.execute('l = lambda x: x'))
+        d.addCallback(lambda _: self.engine.pull('l'))
+        d.addErrback(lambda f: self.assertRaises(pickle.PicklingError, f.raiseException))
+        d.addCallback(lambda _: self.engine.push(dict(l=lambda x: x)))
+        d.addErrback(lambda f: self.assertRaises(pickle.PicklingError, f.raiseException))
+        return d
+        
+    def testPushPullArray(self):
+        try:
+            import numpy
+        except:
+            print 'no numpy, ',
+            return
+        a = numpy.random.random(1000)
+        d = self.engine.push(dict(a=a))
+        d.addCallback(lambda _: self.engine.pull('a'))
+        d.addCallback(lambda b: b==a)
+        d.addCallback(lambda c: c.all())
+        return self.assertDeferredEquals(d, True)
+        
+    def testPushFunction(self):
+                    
+        d = self.engine.push_function(dict(f=testf))
+        d.addCallback(lambda _: self.engine.execute('result = f(10)'))
+        d.addCallback(lambda _: self.engine.pull('result'))
+        d.addCallback(lambda r: self.assertEquals(r, testf(10)))
+        return d
+
+    def testPullFunction(self):
+        d = self.engine.push_function(dict(f=testf, g=testg))
+        d.addCallback(lambda _: self.engine.pull_function(('f','g')))
+        d.addCallback(lambda r: self.assertEquals(r[0](10), testf(10)))
+        return d
+        
+    def testPushFunctionGlobal(self):
+        """Make sure that pushed functions pick up the user's namespace for globals."""
+        d = self.engine.push(dict(globala=globala))
+        d.addCallback(lambda _: self.engine.push_function(dict(g=testg)))
+        d.addCallback(lambda _: self.engine.execute('result = g(10)'))
+        d.addCallback(lambda _: self.engine.pull('result'))
+        d.addCallback(lambda r: self.assertEquals(r, testg(10)))
+        return d
+        
+    def testGetResultFailure(self):
+        d = self.engine.get_result(None)
+        d.addErrback(lambda f: self.assertRaises(IndexError, f.raiseException))
+        d.addCallback(lambda _: self.engine.get_result(10))
+        d.addErrback(lambda f: self.assertRaises(IndexError, f.raiseException))
+        return d
+
+    def runTestGetResult(self, cmd):
+        self.shell = Interpreter()
+        actual = self.shell.execute(cmd)
+        def compare(computed):
+            actual['id'] = computed['id']
+            self.assertEquals(actual, computed)
+        d = self.engine.execute(cmd)
+        d.addCallback(lambda r: self.engine.get_result(r['number']))
+        d.addCallback(compare)
+        return d
+    
+    @parametric
+    def testGetResult(cls):
+        return [(cls.runTestGetResult, cmd) for cmd in validCommands]
+    
+    def testGetResultDefault(self):
+        cmd = 'a=5'
+        shell = self.createShell()
+        shellResult = shell.execute(cmd)
+        def popit(dikt, key):
+            dikt.pop(key)
+            return dikt
+        d = self.engine.execute(cmd)
+        d.addCallback(lambda _: self.engine.get_result())
+        d.addCallback(lambda r: self.assertEquals(shellResult, popit(r,'id')))
+        return d
+
+    def testKeys(self):
+        d = self.engine.keys()
+        d.addCallback(lambda s: isinstance(s, list))
+        d.addCallback(lambda r: self.assertEquals(r, True))
+        return d
+            
+Parametric(IEngineCoreTestCase)
+            
+class IEngineSerializedTestCase(object):
+    """Test an IEngineCore implementer."""
+        
+    def testIEngineSerializedInterface(self):
+        """Does self.engine claim to implement IEngineCore?"""
+        self.assert_(es.IEngineSerialized.providedBy(self.engine))
+        
+    def testIEngineSerializedInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngireCore."""
+        for m in list(es.IEngineSerialized):
+            self.assert_(hasattr(self.engine, m))
+       
+    def testIEngineSerializedDeferreds(self):
+        dList = []
+        d = self.engine.push_serialized(dict(key=newserialized.serialize(12345)))
+        self.assert_(isinstance(d, defer.Deferred))
+        dList.append(d)
+        d = self.engine.pull_serialized('key')
+        self.assert_(isinstance(d, defer.Deferred))
+        dList.append(d)
+        D = defer.DeferredList(dList)
+        return D
+                
+    def testPushPullSerialized(self):
+        objs = [10,"hi there",1.2342354,{"p":(1,2)}]
+        d = defer.succeed(None)
+        for o in objs:
+            self.engine.push_serialized(dict(key=newserialized.serialize(o)))
+            value = self.engine.pull_serialized('key')
+            value.addCallback(lambda serial: newserialized.IUnSerialized(serial).getObject())
+            d = self.assertDeferredEquals(value,o,d)
+        return d
+
+    def testPullSerializedFailures(self):
+        d = self.engine.pull_serialized('a')
+        d.addErrback(lambda f: self.assertRaises(NameError, f.raiseException))
+        d.addCallback(lambda _: self.engine.execute('l = lambda x: x'))
+        d.addCallback(lambda _: self.engine.pull_serialized('l'))
+        d.addErrback(lambda f: self.assertRaises(pickle.PicklingError, f.raiseException))
+        return d
+
+Parametric(IEngineSerializedTestCase)
+
+class IEngineQueuedTestCase(object):
+    """Test an IEngineQueued implementer."""
+        
+    def testIEngineQueuedInterface(self):
+        """Does self.engine claim to implement IEngineQueued?"""
+        self.assert_(es.IEngineQueued.providedBy(self.engine))
+        
+    def testIEngineQueuedInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngireQueued."""
+        for m in list(es.IEngineQueued):
+            self.assert_(hasattr(self.engine, m))
+            
+    def testIEngineQueuedDeferreds(self): 
+        dList = []
+        d = self.engine.clear_queue()
+        self.assert_(isinstance(d, defer.Deferred))
+        dList.append(d)
+        d = self.engine.queue_status()
+        self.assert_(isinstance(d, defer.Deferred))
+        dList.append(d)
+        D = defer.DeferredList(dList)
+        return D
+            
+    def testClearQueue(self):
+        result = self.engine.clear_queue()
+        d1 = self.assertDeferredEquals(result, None)
+        d1.addCallback(lambda _: self.engine.queue_status())
+        d2 = self.assertDeferredEquals(d1, {'queue':[], 'pending':'None'})
+        return d2
+        
+    def testQueueStatus(self):
+        result = self.engine.queue_status()
+        result.addCallback(lambda r: 'queue' in r and 'pending' in r)
+        d = self.assertDeferredEquals(result, True)
+        return d
+
+Parametric(IEngineQueuedTestCase)
+
+class IEnginePropertiesTestCase(object):
+    """Test an IEngineProperties implementor."""
+    
+    def testIEnginePropertiesInterface(self):
+        """Does self.engine claim to implement IEngineProperties?"""
+        self.assert_(es.IEngineProperties.providedBy(self.engine))
+    
+    def testIEnginePropertiesInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngireProperties."""
+        for m in list(es.IEngineProperties):
+            self.assert_(hasattr(self.engine, m))
+    
+    def testGetSetProperties(self):
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d = self.engine.set_properties(dikt)
+        d.addCallback(lambda r: self.engine.get_properties())
+        d = self.assertDeferredEquals(d, dikt)
+        d.addCallback(lambda r: self.engine.get_properties(('c',)))
+        d = self.assertDeferredEquals(d, {'c': dikt['c']})
+        d.addCallback(lambda r: self.engine.set_properties(dict(c=False)))
+        d.addCallback(lambda r: self.engine.get_properties(('c', 'd')))
+        d = self.assertDeferredEquals(d, dict(c=False, d=None))
+        return d
+    
+    def testClearProperties(self):
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d = self.engine.set_properties(dikt)
+        d.addCallback(lambda r: self.engine.clear_properties())
+        d.addCallback(lambda r: self.engine.get_properties())
+        d = self.assertDeferredEquals(d, {})
+        return d
+    
+    def testDelHasProperties(self):
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d = self.engine.set_properties(dikt)
+        d.addCallback(lambda r: self.engine.del_properties(('b','e')))
+        d.addCallback(lambda r: self.engine.has_properties(('a','b','c','d','e')))
+        d = self.assertDeferredEquals(d, [True, False, True, True, False])
+        return d
+    
+    def testStrictDict(self):
+        s = """from IPython.kernel.engineservice import get_engine
+p = get_engine(%s).properties"""%self.engine.id
+        d = self.engine.execute(s)
+        d.addCallback(lambda r: self.engine.execute("p['a'] = lambda _:None"))
+        d = self.assertDeferredRaises(d, error.InvalidProperty)
+        d.addCallback(lambda r: self.engine.execute("p['a'] = range(5)"))
+        d.addCallback(lambda r: self.engine.execute("p['a'].append(5)"))
+        d.addCallback(lambda r: self.engine.get_properties('a'))
+        d = self.assertDeferredEquals(d, dict(a=range(5)))
+        return d
+        
+Parametric(IEnginePropertiesTestCase)
diff --git a/IPython/kernel/tests/multienginetest.py b/IPython/kernel/tests/multienginetest.py
new file mode 100644
index 0000000..4ae3e8c
--- /dev/null
+++ b/IPython/kernel/tests/multienginetest.py
@@ -0,0 +1,838 @@
+# encoding: utf-8
+
+""""""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+
+from IPython.kernel import engineservice as es
+from IPython.kernel import multiengine as me
+from IPython.kernel import newserialized
+from IPython.kernel.error import NotDefined
+from IPython.testutils import util
+from IPython.testutils.parametric import parametric, Parametric
+from IPython.kernel import newserialized
+from IPython.kernel.util import printer
+from IPython.kernel.error import (InvalidEngineID,
+    NoEnginesRegistered,
+    CompositeError,
+    InvalidDeferredID)
+from IPython.kernel.tests.engineservicetest import validCommands, invalidCommands
+from IPython.kernel.core.interpreter import Interpreter
+
+
+#-------------------------------------------------------------------------------
+# Base classes and utilities
+#-------------------------------------------------------------------------------
+
+class IMultiEngineBaseTestCase(object):
+    """Basic utilities for working with multiengine tests.
+
+    Some subclass should define:
+
+    * self.multiengine
+    * self.engines to keep track of engines for clean up"""
+
+    def createShell(self):
+        return Interpreter()
+
+    def addEngine(self, n=1):
+        for i in range(n):
+            e = es.EngineService()
+            e.startService()
+            regDict = self.controller.register_engine(es.QueuedEngine(e), None)
+            e.id = regDict['id']
+            self.engines.append(e)
+
+
+def testf(x):
+    return 2.0*x
+
+
+globala = 99
+
+
+def testg(x):
+    return  globala*x
+
+
+def isdid(did):
+    if not isinstance(did, str):
+        return False
+    if not len(did)==40:
+        return False
+    return True
+
+
+def _raise_it(f):
+    try:
+        f.raiseException()
+    except CompositeError, e:
+        e.raise_exception()
+
+#-------------------------------------------------------------------------------
+# IMultiEngineTestCase
+#-------------------------------------------------------------------------------
+
+class IMultiEngineTestCase(IMultiEngineBaseTestCase):
+    """A test for any object that implements IEngineMultiplexer.
+
+    self.multiengine must be defined and implement IEngineMultiplexer.
+    """
+
+    def testIMultiEngineInterface(self):
+        """Does self.engine claim to implement IEngineCore?"""
+        self.assert_(me.IEngineMultiplexer.providedBy(self.multiengine))
+        self.assert_(me.IMultiEngine.providedBy(self.multiengine))
+
+    def testIEngineMultiplexerInterfaceMethods(self):
+        """Does self.engine have the methods and attributes in IEngineCore."""
+        for m in list(me.IEngineMultiplexer):
+            self.assert_(hasattr(self.multiengine, m))
+
+    def testIEngineMultiplexerDeferreds(self):
+        self.addEngine(1)
+        d= self.multiengine.execute('a=5', targets=0)
+        d.addCallback(lambda _: self.multiengine.push(dict(a=5),targets=0))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=5, b='asdf', c=[1,2,3]),targets=0))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b','c'),targets=0))
+        d.addCallback(lambda _: self.multiengine.get_result(targets=0))
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.keys(targets=0))
+        d.addCallback(lambda _: self.multiengine.push_serialized(dict(a=newserialized.serialize(10)),targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a',targets=0))
+        d.addCallback(lambda _: self.multiengine.clear_queue(targets=0))
+        d.addCallback(lambda _: self.multiengine.queue_status(targets=0))
+        return d
+
+    def testInvalidEngineID(self):
+         self.addEngine(1)
+         badID = 100
+         d = self.multiengine.execute('a=5', targets=badID)
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.push(dict(a=5), targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.pull('a', targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.reset(targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.keys(targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.push_serialized(dict(a=newserialized.serialize(10)), targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         d.addCallback(lambda _: self.multiengine.queue_status(targets=badID))
+         d.addErrback(lambda f: self.assertRaises(InvalidEngineID, f.raiseException))
+         return d
+
+    def testNoEnginesRegistered(self):
+        badID = 'all'
+        d= self.multiengine.execute('a=5', targets=badID)
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=5), targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.pull('a', targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.get_result(targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.reset(targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.keys(targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.push_serialized(dict(a=newserialized.serialize(10)), targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.queue_status(targets=badID))
+        d.addErrback(lambda f: self.assertRaises(NoEnginesRegistered, f.raiseException))
+        return d
+
+    def runExecuteAll(self, d, cmd, shell):
+        actual = shell.execute(cmd)
+        d.addCallback(lambda _: self.multiengine.execute(cmd))
+        def compare(result):
+            for r in result:
+                actual['id'] = r['id']
+                self.assertEquals(r, actual)
+        d.addCallback(compare)
+
+    def testExecuteAll(self):
+        self.addEngine(4)
+        d= defer.Deferred()
+        shell = Interpreter()
+        for cmd in validCommands:
+                self.runExecuteAll(d, cmd, shell)
+        d.callback(None)
+        return d
+
+    # The following two methods show how to do parametrized
+    # tests.  This is really slick!  Same is used above.
+    def runExecuteFailures(self, cmd, exc):
+        self.addEngine(4)
+        d= self.multiengine.execute(cmd)
+        d.addErrback(lambda f: self.assertRaises(exc, _raise_it, f))
+        return d
+
+    @parametric
+    def testExecuteFailures(cls):
+        return [(cls.runExecuteFailures,cmd,exc) for
+                cmd,exc in invalidCommands]
+
+    def testPushPull(self):
+        self.addEngine(1)
+        objs = [10,"hi there",1.2342354,{"p":(1,2)}]
+        d= self.multiengine.push(dict(key=objs[0]), targets=0)
+        d.addCallback(lambda _: self.multiengine.pull('key', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r, [objs[0]]))
+        d.addCallback(lambda _: self.multiengine.push(dict(key=objs[1]), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('key', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r, [objs[1]]))
+        d.addCallback(lambda _: self.multiengine.push(dict(key=objs[2]), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('key', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r, [objs[2]]))
+        d.addCallback(lambda _: self.multiengine.push(dict(key=objs[3]), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('key', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r, [objs[3]]))
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('a', targets=0))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=10,b=20)))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b')))
+        d.addCallback(lambda r: self.assertEquals(r, [[10,20]]))
+        return d
+
+    def testPushPullAll(self):
+        self.addEngine(4)
+        d= self.multiengine.push(dict(a=10))
+        d.addCallback(lambda _: self.multiengine.pull('a'))
+        d.addCallback(lambda r: self.assert_(r==[10,10,10,10]))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=10, b=20)))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b')))
+        d.addCallback(lambda r: self.assert_(r==4*[[10,20]]))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=10, b=20), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b'), targets=0))
+        d.addCallback(lambda r: self.assert_(r==[[10,20]]))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=None, b=None), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b'), targets=0))
+        d.addCallback(lambda r: self.assert_(r==[[None,None]]))
+        return d
+
+    def testPushPullSerialized(self):
+        self.addEngine(1)
+        objs = [10,"hi there",1.2342354,{"p":(1,2)}]
+        d= self.multiengine.push_serialized(dict(key=newserialized.serialize(objs[0])), targets=0)
+        d.addCallback(lambda _: self.multiengine.pull_serialized('key', targets=0))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, objs[0]))
+        d.addCallback(lambda _: self.multiengine.push_serialized(dict(key=newserialized.serialize(objs[1])), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('key', targets=0))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, objs[1]))
+        d.addCallback(lambda _: self.multiengine.push_serialized(dict(key=newserialized.serialize(objs[2])), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('key', targets=0))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, objs[2]))
+        d.addCallback(lambda _: self.multiengine.push_serialized(dict(key=newserialized.serialize(objs[3])), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('key', targets=0))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, objs[3]))
+        d.addCallback(lambda _: self.multiengine.push(dict(a=10,b=range(5)), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized(('a','b'), targets=0))
+        d.addCallback(lambda serial: [newserialized.IUnSerialized(s).getObject() for s in serial[0]])
+        d.addCallback(lambda r: self.assertEquals(r, [10, range(5)]))
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=0))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+        return d
+
+        objs = [10,"hi there",1.2342354,{"p":(1,2)}]
+        d= defer.succeed(None)
+        for o in objs:
+            self.multiengine.push_serialized(0, key=newserialized.serialize(o))
+            value = self.multiengine.pull_serialized(0, 'key')
+            value.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+            d = self.assertDeferredEquals(value,o,d)
+        return d
+
+    def runGetResultAll(self, d, cmd, shell):
+        actual = shell.execute(cmd)
+        d.addCallback(lambda _: self.multiengine.execute(cmd))
+        d.addCallback(lambda _: self.multiengine.get_result())
+        def compare(result):
+            for r in result:
+                actual['id'] = r['id']
+                self.assertEquals(r, actual)
+        d.addCallback(compare)
+
+    def testGetResultAll(self):
+        self.addEngine(4)
+        d= defer.Deferred()
+        shell = Interpreter()
+        for cmd in validCommands:
+                self.runGetResultAll(d, cmd, shell)
+        d.callback(None)
+        return d
+
+    def testGetResultDefault(self):
+        self.addEngine(1)
+        target = 0
+        cmd = 'a=5'
+        shell = self.createShell()
+        shellResult = shell.execute(cmd)
+        def popit(dikt, key):
+            dikt.pop(key)
+            return dikt
+        d= self.multiengine.execute(cmd, targets=target)
+        d.addCallback(lambda _: self.multiengine.get_result(targets=target))
+        d.addCallback(lambda r: self.assertEquals(shellResult, popit(r[0],'id')))
+        return d
+
+    def testGetResultFailure(self):
+        self.addEngine(1)
+        d= self.multiengine.get_result(None, targets=0)
+        d.addErrback(lambda f: self.assertRaises(IndexError, _raise_it, f))
+        d.addCallback(lambda _: self.multiengine.get_result(10, targets=0))
+        d.addErrback(lambda f: self.assertRaises(IndexError, _raise_it, f))
+        return d
+
+    def testPushFunction(self):
+        self.addEngine(1)
+        d= self.multiengine.push_function(dict(f=testf), targets=0)
+        d.addCallback(lambda _: self.multiengine.execute('result = f(10)', targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('result', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0], testf(10)))
+        d.addCallback(lambda _: self.multiengine.push(dict(globala=globala), targets=0))
+        d.addCallback(lambda _: self.multiengine.push_function(dict(g=testg), targets=0))
+        d.addCallback(lambda _: self.multiengine.execute('result = g(10)', targets=0))
+        d.addCallback(lambda _: self.multiengine.pull('result', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0], testg(10)))
+        return d
+
+    def testPullFunction(self):
+        self.addEngine(1)
+        d= self.multiengine.push(dict(a=globala), targets=0)
+        d.addCallback(lambda _: self.multiengine.push_function(dict(f=testf), targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_function('f', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0](10), testf(10)))
+        d.addCallback(lambda _: self.multiengine.execute("def g(x): return x*x", targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_function(('f','g'),targets=0))
+        d.addCallback(lambda r: self.assertEquals((r[0][0](10),r[0][1](10)), (testf(10), 100)))
+        return d
+
+    def testPushFunctionAll(self):
+        self.addEngine(4)
+        d= self.multiengine.push_function(dict(f=testf))
+        d.addCallback(lambda _: self.multiengine.execute('result = f(10)'))
+        d.addCallback(lambda _: self.multiengine.pull('result'))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[testf(10)]))
+        d.addCallback(lambda _: self.multiengine.push(dict(globala=globala)))
+        d.addCallback(lambda _: self.multiengine.push_function(dict(testg=testg)))
+        d.addCallback(lambda _: self.multiengine.execute('result = testg(10)'))
+        d.addCallback(lambda _: self.multiengine.pull('result'))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[testg(10)]))
+        return d
+
+    def testPullFunctionAll(self):
+        self.addEngine(4)
+        d= self.multiengine.push_function(dict(f=testf))
+        d.addCallback(lambda _: self.multiengine.pull_function('f'))
+        d.addCallback(lambda r: self.assertEquals([func(10) for func in r], 4*[testf(10)]))
+        return d
+
+    def testGetIDs(self):
+        self.addEngine(1)
+        d= self.multiengine.get_ids()
+        d.addCallback(lambda r: self.assertEquals(r, [0]))
+        d.addCallback(lambda _: self.addEngine(3))
+        d.addCallback(lambda _: self.multiengine.get_ids())
+        d.addCallback(lambda r: self.assertEquals(r, [0,1,2,3]))
+        return d
+
+    def testClearQueue(self):
+        self.addEngine(4)
+        d= self.multiengine.clear_queue()
+        d.addCallback(lambda r: self.assertEquals(r,4*[None]))
+        return d
+
+    def testQueueStatus(self):
+        self.addEngine(4)
+        d= self.multiengine.queue_status(targets=0)
+        d.addCallback(lambda r: self.assert_(isinstance(r[0],tuple)))
+        return d
+
+    def testGetSetProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.get_properties())
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dikt]))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c',)))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{'c': dikt['c']}]))
+        d.addCallback(lambda r: self.multiengine.set_properties(dict(c=False)))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c', 'd')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dict(c=False, d=None)]))
+        return d
+
+    def testClearProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.clear_properties())
+        d.addCallback(lambda r: self.multiengine.get_properties())
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{}]))
+        return d
+
+    def testDelHasProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.del_properties(('b','e')))
+        d.addCallback(lambda r: self.multiengine.has_properties(('a','b','c','d','e')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[True, False, True, True, False]]))
+        return d
+
+Parametric(IMultiEngineTestCase)
+
+#-------------------------------------------------------------------------------
+# ISynchronousMultiEngineTestCase
+#-------------------------------------------------------------------------------
+
+class ISynchronousMultiEngineTestCase(IMultiEngineBaseTestCase):
+
+    def testISynchronousMultiEngineInterface(self):
+        """Does self.engine claim to implement IEngineCore?"""
+        self.assert_(me.ISynchronousEngineMultiplexer.providedBy(self.multiengine))
+        self.assert_(me.ISynchronousMultiEngine.providedBy(self.multiengine))
+
+    def testExecute(self):
+        self.addEngine(4)
+        execute = self.multiengine.execute
+        d= execute('a=5', targets=0, block=True)
+        d.addCallback(lambda r: self.assert_(len(r)==1))
+        d.addCallback(lambda _: execute('b=10'))
+        d.addCallback(lambda r: self.assert_(len(r)==4))
+        d.addCallback(lambda _: execute('c=30', block=False))
+        d.addCallback(lambda did: self.assert_(isdid(did)))
+        d.addCallback(lambda _: execute('d=[0,1,2]', block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assert_(len(r)==4))
+        return d
+
+    def testPushPull(self):
+        data = dict(a=10, b=1.05, c=range(10), d={'e':(1,2),'f':'hi'})
+        self.addEngine(4)
+        push = self.multiengine.push
+        pull = self.multiengine.pull
+        d= push({'data':data}, targets=0)
+        d.addCallback(lambda r: pull('data', targets=0))
+        d.addCallback(lambda r: self.assertEqual(r,[data]))
+        d.addCallback(lambda _: push({'data':data}))
+        d.addCallback(lambda r: pull('data'))
+        d.addCallback(lambda r: self.assertEqual(r,4*[data]))
+        d.addCallback(lambda _: push({'data':data}, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda _: pull('data', block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEqual(r,4*[data]))
+        d.addCallback(lambda _: push(dict(a=10,b=20)))
+        d.addCallback(lambda _: pull(('a','b')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[10,20]]))
+        return d
+
+    def testPushPullFunction(self):
+        self.addEngine(4)
+        pushf = self.multiengine.push_function
+        pullf = self.multiengine.pull_function
+        push = self.multiengine.push
+        pull = self.multiengine.pull
+        execute = self.multiengine.execute
+        d= pushf({'testf':testf}, targets=0)
+        d.addCallback(lambda r: pullf('testf', targets=0))
+        d.addCallback(lambda r: self.assertEqual(r[0](1.0), testf(1.0)))
+        d.addCallback(lambda _: execute('r = testf(10)', targets=0))
+        d.addCallback(lambda _: pull('r', targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0], testf(10)))
+        d.addCallback(lambda _: pushf({'testf':testf}, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda _: pullf('testf', block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEqual(r[0](1.0), testf(1.0)))
+        d.addCallback(lambda _: execute("def g(x): return x*x", targets=0))
+        d.addCallback(lambda _: pullf(('testf','g'),targets=0))
+        d.addCallback(lambda r: self.assertEquals((r[0][0](10),r[0][1](10)), (testf(10), 100)))
+        return d
+
+    def testGetResult(self):
+        shell = Interpreter()
+        result1 = shell.execute('a=10')
+        result1['id'] = 0
+        result2 = shell.execute('b=20')
+        result2['id'] = 0
+        execute= self.multiengine.execute
+        get_result = self.multiengine.get_result
+        self.addEngine(1)
+        d= execute('a=10')
+        d.addCallback(lambda _: get_result())
+        d.addCallback(lambda r: self.assertEquals(r[0], result1))
+        d.addCallback(lambda _: execute('b=20'))
+        d.addCallback(lambda _: get_result(1))
+        d.addCallback(lambda r: self.assertEquals(r[0], result1))
+        d.addCallback(lambda _: get_result(2, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r[0], result2))
+        return d
+
+    def testResetAndKeys(self):
+        self.addEngine(1)
+
+        #Blocking mode
+        d= self.multiengine.push(dict(a=10, b=20, c=range(10)), targets=0)
+        d.addCallback(lambda _: self.multiengine.keys(targets=0))
+        def keys_found(keys):
+            self.assert_('a' in keys[0])
+            self.assert_('b' in keys[0])
+            self.assert_('b' in keys[0])
+        d.addCallback(keys_found)
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.keys(targets=0))
+        def keys_not_found(keys):
+            self.assert_('a' not in keys[0])
+            self.assert_('b' not in keys[0])
+            self.assert_('b' not in keys[0])
+        d.addCallback(keys_not_found)
+
+        #Non-blocking mode
+        d.addCallback(lambda _: self.multiengine.push(dict(a=10, b=20, c=range(10)), targets=0))
+        d.addCallback(lambda _: self.multiengine.keys(targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        def keys_found(keys):
+            self.assert_('a' in keys[0])
+            self.assert_('b' in keys[0])
+            self.assert_('b' in keys[0])
+        d.addCallback(keys_found)
+        d.addCallback(lambda _: self.multiengine.reset(targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda _: self.multiengine.keys(targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        def keys_not_found(keys):
+            self.assert_('a' not in keys[0])
+            self.assert_('b' not in keys[0])
+            self.assert_('b' not in keys[0])
+        d.addCallback(keys_not_found)
+
+        return d
+
+    def testPushPullSerialized(self):
+        self.addEngine(1)
+        dikt = dict(a=10,b='hi there',c=1.2345,d={'p':(1,2)})
+        sdikt = {}
+        for k,v in dikt.iteritems():
+            sdikt[k] = newserialized.serialize(v)
+        d= self.multiengine.push_serialized(dict(a=sdikt['a']), targets=0)
+        d.addCallback(lambda _: self.multiengine.pull('a',targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0], dikt['a']))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=0))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, dikt['a']))
+        d.addCallback(lambda _: self.multiengine.push_serialized(sdikt, targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized(sdikt.keys(), targets=0))
+        d.addCallback(lambda serial: [newserialized.IUnSerialized(s).getObject() for s in serial[0]])
+        d.addCallback(lambda r: self.assertEquals(r, dikt.values()))
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=0))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+
+        #Non-blocking mode
+        d.addCallback(lambda r: self.multiengine.push_serialized(dict(a=sdikt['a']), targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda _: self.multiengine.pull('a',targets=0))
+        d.addCallback(lambda r: self.assertEquals(r[0], dikt['a']))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda serial: newserialized.IUnSerialized(serial[0]).getObject())
+        d.addCallback(lambda r: self.assertEquals(r, dikt['a']))
+        d.addCallback(lambda _: self.multiengine.push_serialized(sdikt, targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda _: self.multiengine.pull_serialized(sdikt.keys(), targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda serial: [newserialized.IUnSerialized(s).getObject() for s in serial[0]])
+        d.addCallback(lambda r: self.assertEquals(r, dikt.values()))
+        d.addCallback(lambda _: self.multiengine.reset(targets=0))
+        d.addCallback(lambda _: self.multiengine.pull_serialized('a', targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+        return d
+
+    def testClearQueue(self):
+        self.addEngine(4)
+        d= self.multiengine.clear_queue()
+        d.addCallback(lambda r: self.multiengine.clear_queue(block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r,4*[None]))
+        return d
+
+    def testQueueStatus(self):
+        self.addEngine(4)
+        d= self.multiengine.queue_status(targets=0)
+        d.addCallback(lambda r: self.assert_(isinstance(r[0],tuple)))
+        d.addCallback(lambda r: self.multiengine.queue_status(targets=0, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assert_(isinstance(r[0],tuple)))
+        return d
+
+    def testGetIDs(self):
+        self.addEngine(1)
+        d= self.multiengine.get_ids()
+        d.addCallback(lambda r: self.assertEquals(r, [0]))
+        d.addCallback(lambda _: self.addEngine(3))
+        d.addCallback(lambda _: self.multiengine.get_ids())
+        d.addCallback(lambda r: self.assertEquals(r, [0,1,2,3]))
+        return d
+
+    def testGetSetProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.get_properties())
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dikt]))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c',)))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{'c': dikt['c']}]))
+        d.addCallback(lambda r: self.multiengine.set_properties(dict(c=False)))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c', 'd')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dict(c=False, d=None)]))
+
+        #Non-blocking
+        d.addCallback(lambda r: self.multiengine.set_properties(dikt, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.get_properties(block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dikt]))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c',), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{'c': dikt['c']}]))
+        d.addCallback(lambda r: self.multiengine.set_properties(dict(c=False), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.get_properties(('c', 'd'), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[dict(c=False, d=None)]))
+        return d
+
+    def testClearProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.clear_properties())
+        d.addCallback(lambda r: self.multiengine.get_properties())
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{}]))
+
+        #Non-blocking
+        d.addCallback(lambda r: self.multiengine.set_properties(dikt, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.clear_properties(block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.get_properties(block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[{}]))
+        return d
+
+    def testDelHasProperties(self):
+        self.addEngine(4)
+        dikt = dict(a=5, b='asdf', c=True, d=None, e=range(5))
+        d= self.multiengine.set_properties(dikt)
+        d.addCallback(lambda r: self.multiengine.del_properties(('b','e')))
+        d.addCallback(lambda r: self.multiengine.has_properties(('a','b','c','d','e')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[True, False, True, True, False]]))
+
+        #Non-blocking
+        d.addCallback(lambda r: self.multiengine.set_properties(dikt, block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.del_properties(('b','e'), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.has_properties(('a','b','c','d','e'), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[True, False, True, True, False]]))
+        return d
+
+    def test_clear_pending_deferreds(self):
+        self.addEngine(4)
+        did_list = []
+        d= self.multiengine.execute('a=10',block=False)
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.push(dict(b=10),block=False))
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.pull(('a','b'),block=False))
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.clear_pending_deferreds())
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[0],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[1],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[2],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        return d
+
+#-------------------------------------------------------------------------------
+# Coordinator test cases
+#-------------------------------------------------------------------------------
+
+class IMultiEngineCoordinatorTestCase(object):
+
+    def testScatterGather(self):
+        self.addEngine(4)
+        d= self.multiengine.scatter('a', range(16))
+        d.addCallback(lambda r: self.multiengine.gather('a'))
+        d.addCallback(lambda r: self.assertEquals(r, range(16)))
+        d.addCallback(lambda _: self.multiengine.gather('asdf'))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+        return d
+
+    def testScatterGatherNumpy(self):
+        try:
+            import numpy
+            from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
+        except:
+            return
+        else:
+            self.addEngine(4)
+            a = numpy.arange(16)
+            d = self.multiengine.scatter('a', a)
+            d.addCallback(lambda r: self.multiengine.gather('a'))
+            d.addCallback(lambda r: assert_array_equal(r, a))
+            return d
+
+    def testMap(self):
+        self.addEngine(4)
+        def f(x):
+            return x**2
+        data = range(16)
+        d= self.multiengine.map(f, data)
+        d.addCallback(lambda r: self.assertEquals(r,[f(x) for x in data]))
+        return d
+
+
+class ISynchronousMultiEngineCoordinatorTestCase(IMultiEngineCoordinatorTestCase):
+
+    def testScatterGatherNonblocking(self):
+        self.addEngine(4)
+        d= self.multiengine.scatter('a', range(16), block=False)
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.gather('a', block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r, range(16)))
+        return d
+
+    def testScatterGatherNumpyNonblocking(self):
+        try:
+            import numpy
+            from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
+        except:
+            return
+        else:
+            self.addEngine(4)
+            a = numpy.arange(16)
+            d = self.multiengine.scatter('a', a, block=False)
+            d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+            d.addCallback(lambda r: self.multiengine.gather('a', block=False))
+            d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+            d.addCallback(lambda r: assert_array_equal(r, a))
+            return d
+
+    def testMapNonblocking(self):
+        self.addEngine(4)
+        def f(x):
+            return x**2
+        data = range(16)
+        d= self.multiengine.map(f, data, block=False)
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assertEquals(r,[f(x) for x in data]))
+        return d
+
+    def test_clear_pending_deferreds(self):
+        self.addEngine(4)
+        did_list = []
+        d= self.multiengine.scatter('a',range(16),block=False)
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.gather('a',block=False))
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.map(lambda x: x, range(16),block=False))
+        d.addCallback(lambda did: did_list.append(did))
+        d.addCallback(lambda _: self.multiengine.clear_pending_deferreds())
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[0],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[1],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        d.addCallback(lambda _: self.multiengine.get_pending_deferred(did_list[2],True))
+        d.addErrback(lambda f: self.assertRaises(InvalidDeferredID, f.raiseException))
+        return d
+
+#-------------------------------------------------------------------------------
+# Extras test cases
+#-------------------------------------------------------------------------------
+
+class IMultiEngineExtrasTestCase(object):
+
+    def testZipPull(self):
+        self.addEngine(4)
+        d= self.multiengine.push(dict(a=10,b=20))
+        d.addCallback(lambda r: self.multiengine.zip_pull(('a','b')))
+        d.addCallback(lambda r: self.assert_(r, [4*[10],4*[20]]))
+        return d
+
+    def testRun(self):
+        self.addEngine(4)
+        import tempfile
+        fname = tempfile.mktemp('foo.py')
+        f= open(fname, 'w')
+        f.write('a = 10\nb=30')
+        f.close()
+        d= self.multiengine.run(fname)
+        d.addCallback(lambda r: self.multiengine.pull(('a','b')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[10,30]]))
+        return d
+
+
+class ISynchronousMultiEngineExtrasTestCase(IMultiEngineExtrasTestCase):
+
+    def testZipPullNonblocking(self):
+        self.addEngine(4)
+        d= self.multiengine.push(dict(a=10,b=20))
+        d.addCallback(lambda r: self.multiengine.zip_pull(('a','b'), block=False))
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.assert_(r, [4*[10],4*[20]]))
+        return d
+
+    def testRunNonblocking(self):
+        self.addEngine(4)
+        import tempfile
+        fname = tempfile.mktemp('foo.py')
+        f= open(fname, 'w')
+        f.write('a = 10\nb=30')
+        f.close()
+        d= self.multiengine.run(fname, block=False)
+        d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
+        d.addCallback(lambda r: self.multiengine.pull(('a','b')))
+        d.addCallback(lambda r: self.assertEquals(r, 4*[[10,30]]))
+        return d
+
+
+#-------------------------------------------------------------------------------
+# IFullSynchronousMultiEngineTestCase
+#-------------------------------------------------------------------------------
+
+class IFullSynchronousMultiEngineTestCase(ISynchronousMultiEngineTestCase,
+    ISynchronousMultiEngineCoordinatorTestCase,
+    ISynchronousMultiEngineExtrasTestCase):
+    pass
diff --git a/IPython/kernel/tests/tasktest.py b/IPython/kernel/tests/tasktest.py
new file mode 100644
index 0000000..10a0a35
--- /dev/null
+++ b/IPython/kernel/tests/tasktest.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import time
+
+from IPython.kernel import task, engineservice as es
+from IPython.kernel.util import printer
+from IPython.kernel import error
+
+#-------------------------------------------------------------------------------
+# Tests
+#-------------------------------------------------------------------------------
+
+def _raise_it(f):
+    try:
+        f.raiseException()
+    except CompositeError, e:
+        e.raise_exception() 
+
+class TaskTestBase(object):
+    
+    def addEngine(self, n=1):
+        for i in range(n):
+            e = es.EngineService()
+            e.startService()
+            regDict = self.controller.register_engine(es.QueuedEngine(e), None)
+            e.id = regDict['id']
+            self.engines.append(e)
+
+
+class ITaskControllerTestCase(TaskTestBase):
+        
+    def testTaskIDs(self):
+        self.addEngine(1)
+        d = self.tc.run(task.Task('a=5'))
+        d.addCallback(lambda r: self.assertEquals(r, 0))
+        d.addCallback(lambda r: self.tc.run(task.Task('a=5')))
+        d.addCallback(lambda r: self.assertEquals(r, 1))
+        d.addCallback(lambda r: self.tc.run(task.Task('a=5')))
+        d.addCallback(lambda r: self.assertEquals(r, 2))
+        d.addCallback(lambda r: self.tc.run(task.Task('a=5')))
+        d.addCallback(lambda r: self.assertEquals(r, 3))
+        return d
+    
+    def testAbort(self):
+        """Cannot do a proper abort test, because blocking execution prevents
+        abort from being called before task completes"""
+        self.addEngine(1)
+        t = task.Task('a=5')
+        d = self.tc.abort(0)
+        d.addErrback(lambda f: self.assertRaises(IndexError, f.raiseException))
+        d.addCallback(lambda _:self.tc.run(t))
+        d.addCallback(self.tc.abort)
+        d.addErrback(lambda f: self.assertRaises(IndexError, f.raiseException))
+        return d
+    
+    def testAbortType(self):
+        self.addEngine(1)
+        d = self.tc.abort('asdfadsf')
+        d.addErrback(lambda f: self.assertRaises(TypeError, f.raiseException))
+        return d
+    
+    def testClears(self):
+        self.addEngine(1)
+        t = task.Task('a=1', clear_before=True, pull='b', clear_after=True)
+        d = self.multiengine.execute('b=1', targets=0)
+        d.addCallback(lambda _: self.tc.run(t))
+        d.addCallback(lambda tid: self.tc.get_task_result(tid,block=True))
+        d.addCallback(lambda tr: tr.failure)
+        d.addErrback(lambda f: self.assertRaises(NameError, f.raiseException))
+        d.addCallback(lambda _:self.multiengine.pull('a', targets=0))
+        d.addErrback(lambda f: self.assertRaises(NameError, _raise_it, f))
+        return d
+    
+    def testSimpleRetries(self):
+        self.addEngine(1)
+        t = task.Task("i += 1\nassert i == 16", pull='i',retries=10)
+        t2 = task.Task("i += 1\nassert i == 16", pull='i',retries=10)
+        d = self.multiengine.execute('i=0', targets=0)
+        d.addCallback(lambda r: self.tc.run(t))
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: tr.ns.i)
+        d.addErrback(lambda f: self.assertRaises(AssertionError, f.raiseException))
+        
+        d.addCallback(lambda r: self.tc.run(t2))
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: tr.ns.i)
+        d.addCallback(lambda r: self.assertEquals(r, 16))
+        return d
+    
+    def testRecoveryTasks(self):
+        self.addEngine(1)
+        t = task.Task("i=16", pull='i')
+        t2 = task.Task("raise Exception", recovery_task=t, retries = 2)
+        
+        d = self.tc.run(t2)
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: tr.ns.i)
+        d.addCallback(lambda r: self.assertEquals(r, 16))
+        return d
+    
+    # def testInfiniteRecoveryLoop(self):
+    #     self.addEngine(1)
+    #     t = task.Task("raise Exception", retries = 5)
+    #     t2 = task.Task("assert True", retries = 2, recovery_task = t)
+    #     t.recovery_task = t2
+    #     
+    #     d = self.tc.run(t)
+    #     d.addCallback(self.tc.get_task_result, block=True)
+    #     d.addCallback(lambda tr: tr.ns.i)
+    #     d.addBoth(printer)
+    #     d.addErrback(lambda f: self.assertRaises(AssertionError, f.raiseException))
+    #     return d
+    # 
+    def testSetupNS(self):
+        self.addEngine(1)
+        d = self.multiengine.execute('a=0', targets=0)
+        ns = dict(a=1, b=0)
+        t = task.Task("", push=ns, pull=['a','b'])
+        d.addCallback(lambda r: self.tc.run(t))
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: {'a':tr.ns.a, 'b':tr['b']})
+        d.addCallback(lambda r: self.assertEquals(r, ns))
+        return d
+    
+    def testTaskResults(self):
+        self.addEngine(1)
+        t1 = task.Task('a=5', pull='a')
+        d = self.tc.run(t1)
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: (tr.ns.a,tr['a'],tr.failure, tr.raiseException()))
+        d.addCallback(lambda r: self.assertEquals(r, (5,5,None,None)))  
+        
+        t2 = task.Task('7=5')
+        d.addCallback(lambda r: self.tc.run(t2))
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: tr.ns)
+        d.addErrback(lambda f: self.assertRaises(SyntaxError, f.raiseException))
+        
+        t3 = task.Task('', pull='b')
+        d.addCallback(lambda r: self.tc.run(t3))
+        d.addCallback(self.tc.get_task_result, block=True)
+        d.addCallback(lambda tr: tr.ns)
+        d.addErrback(lambda f: self.assertRaises(NameError, f.raiseException))
+        return d
diff --git a/IPython/kernel/tests/test_controllerservice.py b/IPython/kernel/tests/test_controllerservice.py
new file mode 100644
index 0000000..212b235
--- /dev/null
+++ b/IPython/kernel/tests/test_controllerservice.py
@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+"""This file contains unittests for the kernel.engineservice.py module.
+
+Things that should be tested:
+
+ - Should the EngineService return Deferred objects?
+ - Run the same tests that are run in shell.py.
+ - Make sure that the Interface is really implemented.
+ - The startService and stopService methods.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.application.service import IService
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel.tests import multienginetest as met
+from controllertest import IControllerCoreTestCase
+from IPython.testutils.util import DeferredTestCase
+
+class BasicControllerServiceTest(DeferredTestCase,
+    IControllerCoreTestCase):
+    
+    def setUp(self):
+        self.controller  = ControllerService()
+        self.controller.startService()
+    
+    def tearDown(self):
+        self.controller.stopService()
diff --git a/IPython/kernel/tests/test_enginefc.py b/IPython/kernel/tests/test_enginefc.py
new file mode 100644
index 0000000..ee0f0cb
--- /dev/null
+++ b/IPython/kernel/tests/test_enginefc.py
@@ -0,0 +1,89 @@
+# encoding: utf-8
+
+"""This file contains unittests for the enginepb.py module."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+
+from twisted.python import components
+from twisted.internet import reactor, defer
+from twisted.spread import pb
+from twisted.internet.base import DelayedCall
+DelayedCall.debug = True
+
+import zope.interface as zi
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+from IPython.kernel import engineservice as es
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.controllerservice import IControllerBase
+from IPython.kernel.enginefc import FCRemoteEngineRefFromService, IEngineBase
+from IPython.kernel.engineservice import IEngineQueued
+from IPython.kernel.engineconnector import EngineConnector
+    
+from IPython.kernel.tests.engineservicetest import \
+    IEngineCoreTestCase, \
+    IEngineSerializedTestCase, \
+    IEngineQueuedTestCase
+
+class EngineFCTest(DeferredTestCase, 
+                   IEngineCoreTestCase, 
+                   IEngineSerializedTestCase,
+                   IEngineQueuedTestCase
+                   ):
+        
+    zi.implements(IControllerBase)
+        
+    def setUp(self):
+
+        # Start a server and append to self.servers
+        self.controller_reference = FCRemoteEngineRefFromService(self)
+        self.controller_tub = Tub()
+        self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
+        self.controller_tub.setLocation('127.0.0.1:10105')
+        
+        furl = self.controller_tub.registerReference(self.controller_reference)
+        self.controller_tub.startService()
+        
+        # Start an EngineService and append to services/client
+        self.engine_service = es.EngineService()
+        self.engine_service.startService()
+        self.engine_tub = Tub()
+        self.engine_tub.startService()
+        engine_connector = EngineConnector(self.engine_tub)
+        d = engine_connector.connect_to_controller(self.engine_service, furl)
+        # This deferred doesn't fire until after register_engine has returned and
+        # thus, self.engine has been defined and the tets can proceed.
+        return d
+    
+    def tearDown(self):
+        dlist = []
+        # Shut down the engine
+        d = self.engine_tub.stopService()
+        dlist.append(d)
+        # Shut down the controller
+        d = self.controller_tub.stopService()
+        dlist.append(d)
+        return defer.DeferredList(dlist)
+    
+    #---------------------------------------------------------------------------
+    # Make me look like a basic controller
+    #---------------------------------------------------------------------------
+    
+    def register_engine(self, engine_ref, id=None, ip=None, port=None, pid=None):
+        self.engine = IEngineQueued(IEngineBase(engine_ref))
+        return {'id':id}
+    
+    def unregister_engine(self, id):
+        pass
\ No newline at end of file
diff --git a/IPython/kernel/tests/test_engineservice.py b/IPython/kernel/tests/test_engineservice.py
new file mode 100644
index 0000000..d815bae
--- /dev/null
+++ b/IPython/kernel/tests/test_engineservice.py
@@ -0,0 +1,64 @@
+# encoding: utf-8
+
+"""This file contains unittests for the kernel.engineservice.py module.
+
+Things that should be tested:
+
+ - Should the EngineService return Deferred objects?
+ - Run the same tests that are run in shell.py.
+ - Make sure that the Interface is really implemented.
+ - The startService and stopService methods.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+from twisted.application.service import IService
+
+from IPython.kernel import engineservice as es
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.tests.engineservicetest import \
+    IEngineCoreTestCase, \
+    IEngineSerializedTestCase, \
+    IEngineQueuedTestCase, \
+    IEnginePropertiesTestCase
+    
+
+class BasicEngineServiceTest(DeferredTestCase,
+                             IEngineCoreTestCase, 
+                             IEngineSerializedTestCase,
+                             IEnginePropertiesTestCase):
+    
+    def setUp(self):
+        self.engine = es.EngineService()
+        self.engine.startService()
+    
+    def tearDown(self):
+        return self.engine.stopService()
+
+class QueuedEngineServiceTest(DeferredTestCase,
+                              IEngineCoreTestCase, 
+                              IEngineSerializedTestCase,
+                              IEnginePropertiesTestCase,
+                              IEngineQueuedTestCase):
+                              
+    def setUp(self):
+        self.rawEngine = es.EngineService()
+        self.rawEngine.startService()
+        self.engine = es.IEngineQueued(self.rawEngine)
+        
+    def tearDown(self):
+        return self.rawEngine.stopService()
+
+ 
diff --git a/IPython/kernel/tests/test_multiengine.py b/IPython/kernel/tests/test_multiengine.py
new file mode 100644
index 0000000..dd8f619
--- /dev/null
+++ b/IPython/kernel/tests/test_multiengine.py
@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+""""""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel import multiengine as me
+from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
+    ISynchronousMultiEngineTestCase)
+    
+    
+class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):
+    
+    def setUp(self):
+        self.controller = ControllerService()
+        self.controller.startService()
+        self.multiengine = me.IMultiEngine(self.controller)
+        self.engines = []
+        
+    def tearDown(self):
+        self.controller.stopService()
+        for e in self.engines:
+            e.stopService()
+
+
+class SynchronousMultiEngineTestCase(DeferredTestCase, ISynchronousMultiEngineTestCase):
+    
+    def setUp(self):
+        self.controller = ControllerService()
+        self.controller.startService()
+        self.multiengine = me.ISynchronousMultiEngine(me.IMultiEngine(self.controller))
+        self.engines = []
+        
+    def tearDown(self):
+        self.controller.stopService()
+        for e in self.engines:
+            e.stopService()
+
diff --git a/IPython/kernel/tests/test_multienginefc.py b/IPython/kernel/tests/test_multienginefc.py
new file mode 100644
index 0000000..90f65c1
--- /dev/null
+++ b/IPython/kernel/tests/test_multienginefc.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer, reactor
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel.multiengine import IMultiEngine
+from IPython.kernel.tests.multienginetest import IFullSynchronousMultiEngineTestCase
+from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
+from IPython.kernel import multiengine as me
+from IPython.kernel.clientconnector import ClientConnector
+
+
+class FullSynchronousMultiEngineTestCase(DeferredTestCase, IFullSynchronousMultiEngineTestCase):
+    
+    def setUp(self):
+        
+        self.engines = []
+                
+        self.controller = ControllerService()
+        self.controller.startService()
+        self.imultiengine = IMultiEngine(self.controller)
+        self.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
+
+        self.controller_tub = Tub()
+        self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
+        self.controller_tub.setLocation('127.0.0.1:10105')
+        
+        furl = self.controller_tub.registerReference(self.mec_referenceable)
+        self.controller_tub.startService()
+        
+        self.client_tub = ClientConnector()
+        d = self.client_tub.get_multiengine_client(furl)
+        d.addCallback(self.handle_got_client)
+        return d
+        
+    def handle_got_client(self, client):
+        self.multiengine = client
+    
+    def tearDown(self):
+        dlist = []
+        # Shut down the multiengine client
+        d = self.client_tub.tub.stopService()
+        dlist.append(d)
+        # Shut down the engines
+        for e in self.engines:
+            e.stopService()
+        # Shut down the controller
+        d = self.controller_tub.stopService()
+        d.addBoth(lambda _: self.controller.stopService())
+        dlist.append(d)
+        return defer.DeferredList(dlist)
diff --git a/IPython/kernel/tests/test_newserialized.py b/IPython/kernel/tests/test_newserialized.py
new file mode 100644
index 0000000..1fde7ac
--- /dev/null
+++ b/IPython/kernel/tests/test_newserialized.py
@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+"""This file contains unittests for the shell.py module."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import zope.interface as zi
+from twisted.trial import unittest
+from IPython.testutils.util import DeferredTestCase
+
+from IPython.kernel.newserialized import \
+    ISerialized, \
+    IUnSerialized, \
+    Serialized, \
+    UnSerialized, \
+    SerializeIt, \
+    UnSerializeIt
+    
+#-------------------------------------------------------------------------------
+# Tests
+#-------------------------------------------------------------------------------
+    
+class SerializedTestCase(unittest.TestCase):
+    
+    def setUp(self):
+        pass
+        
+    def tearDown(self):
+        pass
+        
+    def testSerializedInterfaces(self):
+
+        us = UnSerialized({'a':10, 'b':range(10)})
+        s = ISerialized(us)
+        uss = IUnSerialized(s)
+        self.assert_(ISerialized.providedBy(s))
+        self.assert_(IUnSerialized.providedBy(us))
+        self.assert_(IUnSerialized.providedBy(uss))
+        for m in list(ISerialized):
+            self.assert_(hasattr(s, m))
+        for m in list(IUnSerialized):
+            self.assert_(hasattr(us, m))
+        for m in list(IUnSerialized):
+            self.assert_(hasattr(uss, m))
+
+    def testPickleSerialized(self):
+        obj = {'a':1.45345, 'b':'asdfsdf', 'c':10000L}
+        original = UnSerialized(obj)
+        originalSer = ISerialized(original)
+        firstData = originalSer.getData()
+        firstTD = originalSer.getTypeDescriptor()
+        firstMD = originalSer.getMetadata()
+        self.assert_(firstTD == 'pickle')
+        self.assert_(firstMD == {})
+        unSerialized = IUnSerialized(originalSer)
+        secondObj = unSerialized.getObject()
+        for k, v in secondObj.iteritems():
+            self.assert_(obj[k] == v)
+        secondSer = ISerialized(UnSerialized(secondObj))
+        self.assert_(firstData == secondSer.getData())
+        self.assert_(firstTD == secondSer.getTypeDescriptor() )
+        self.assert_(firstMD == secondSer.getMetadata())
+        
+    def testNDArraySerialized(self):
+        try:
+            import numpy
+        except ImportError:
+            pass
+        else:
+            a = numpy.linspace(0.0, 1.0, 1000)
+            unSer1 = UnSerialized(a)
+            ser1 = ISerialized(unSer1)
+            td = ser1.getTypeDescriptor()
+            self.assert_(td == 'ndarray')
+            md = ser1.getMetadata()
+            self.assert_(md['shape'] == a.shape)
+            self.assert_(md['dtype'] == a.dtype.str)
+            buff = ser1.getData()
+            self.assert_(buff == numpy.getbuffer(a))
+            s = Serialized(buff, td, md)
+            us = IUnSerialized(s)
+            final = us.getObject()
+            self.assert_(numpy.getbuffer(a) == numpy.getbuffer(final))
+            self.assert_(a.dtype.str == final.dtype.str)
+            self.assert_(a.shape == final.shape)
+            
+            
+    
\ No newline at end of file
diff --git a/IPython/kernel/tests/test_pendingdeferred.py b/IPython/kernel/tests/test_pendingdeferred.py
new file mode 100644
index 0000000..a96be3e
--- /dev/null
+++ b/IPython/kernel/tests/test_pendingdeferred.py
@@ -0,0 +1,215 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Tests for pendingdeferred.py"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.internet import defer
+from twisted.python import failure
+
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+from IPython.testutils.util import DeferredTestCase
+import IPython.kernel.pendingdeferred as pd
+from IPython.kernel import error
+from IPython.kernel.util import printer
+
+
+#-------------------------------------------------------------------------------
+# Setup for inline and standalone doctests
+#-------------------------------------------------------------------------------
+
+
+# If you have standalone doctests in a separate file, set their names in the
+# dt_files variable (as a single string  or a list thereof):
+dt_files = []
+
+# If you have any modules whose docstrings should be scanned for embedded tests
+# as examples accorging to standard doctest practice, set them here (as a
+# single string or a list thereof):
+dt_modules = []
+
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+
+class Foo(object):
+    
+    def bar(self, bahz):
+        return defer.succeed('blahblah: %s' % bahz)
+
+class TwoPhaseFoo(pd.PendingDeferredManager):
+    
+    def __init__(self, foo):
+        self.foo = foo
+        pd.PendingDeferredManager.__init__(self)
+
+    @pd.two_phase
+    def bar(self, bahz):
+        return self.foo.bar(bahz)
+
+class PendingDeferredManagerTest(DeferredTestCase):
+    
+    def setUp(self):
+        self.pdm = pd.PendingDeferredManager()
+        
+    def tearDown(self):
+        pass
+    
+    def testBasic(self):
+        dDict = {}
+        # Create 10 deferreds and save them
+        for i in range(10):
+            d = defer.Deferred()
+            did = self.pdm.save_pending_deferred(d)
+            dDict[did] = d
+        # Make sure they are begin saved
+        for k in dDict.keys():
+            self.assert_(self.pdm.quick_has_id(k))
+        # Get the pending deferred (block=True), then callback with 'foo' and compare
+        for did in dDict.keys()[0:5]:
+            d = self.pdm.get_pending_deferred(did,block=True)
+            dDict[did].callback('foo')
+            d.addCallback(lambda r: self.assert_(r=='foo'))
+        # Get the pending deferreds with (block=False) and make sure ResultNotCompleted is raised
+        for did in dDict.keys()[5:10]:
+            d = self.pdm.get_pending_deferred(did,block=False)
+            d.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
+        # Now callback the last 5, get them and compare.
+        for did in dDict.keys()[5:10]:
+            dDict[did].callback('foo')
+            d = self.pdm.get_pending_deferred(did,block=False)
+            d.addCallback(lambda r: self.assert_(r=='foo'))
+    
+    def test_save_then_delete(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        self.assert_(self.pdm.quick_has_id(did))
+        self.pdm.delete_pending_deferred(did)
+        self.assert_(not self.pdm.quick_has_id(did))
+    
+    def test_save_get_delete(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d2.addErrback(lambda f: self.assertRaises(error.AbortedPendingDeferredError, f.raiseException))
+        self.pdm.delete_pending_deferred(did)
+        return d2
+   
+    def test_double_get(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d3 = self.pdm.get_pending_deferred(did,True)
+        d3.addErrback(lambda f: self.assertRaises(error.InvalidDeferredID, f.raiseException))
+    
+    def test_get_after_callback(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d.callback('foo')
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d2.addCallback(lambda r: self.assertEquals(r,'foo'))
+        self.assert_(not self.pdm.quick_has_id(did))
+
+    def test_get_before_callback(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d.callback('foo')
+        d2.addCallback(lambda r: self.assertEquals(r,'foo'))
+        self.assert_(not self.pdm.quick_has_id(did))
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d2.addCallback(lambda r: self.assertEquals(r,'foo'))
+        d.callback('foo')
+        self.assert_(not self.pdm.quick_has_id(did))
+    
+    def test_get_after_errback(self):
+        class MyError(Exception):
+            pass
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d.errback(failure.Failure(MyError('foo')))
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
+        self.assert_(not self.pdm.quick_has_id(did))
+
+    def test_get_before_errback(self):
+        class MyError(Exception):
+            pass
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d.errback(failure.Failure(MyError('foo')))
+        d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
+        self.assert_(not self.pdm.quick_has_id(did))
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
+        d.errback(failure.Failure(MyError('foo')))
+        self.assert_(not self.pdm.quick_has_id(did))
+        
+    def test_noresult_noblock(self):
+        d = defer.Deferred()
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,False)
+        d2.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
+
+    def test_with_callbacks(self):
+        d = defer.Deferred()
+        d.addCallback(lambda r: r+' foo')
+        d.addCallback(lambda r: r+' bar')
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d.callback('bam')
+        d2.addCallback(lambda r: self.assertEquals(r,'bam foo bar'))
+    
+    def test_with_errbacks(self):
+        class MyError(Exception):
+            pass
+        d = defer.Deferred()
+        d.addCallback(lambda r: 'foo')
+        d.addErrback(lambda f: 'caught error')
+        did = self.pdm.save_pending_deferred(d)
+        d2 = self.pdm.get_pending_deferred(did,True)
+        d.errback(failure.Failure(MyError('bam')))
+        d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
+    
+    def test_nested_deferreds(self):
+        d = defer.Deferred()
+        d2 = defer.Deferred()
+        d.addCallback(lambda r: d2)
+        did = self.pdm.save_pending_deferred(d)
+        d.callback('foo')
+        d3 = self.pdm.get_pending_deferred(did,False)
+        d3.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
+        d2.callback('bar')
+        d3 = self.pdm.get_pending_deferred(did,False)
+        d3.addCallback(lambda r: self.assertEquals(r,'bar'))
+
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+# This ensures that the code will run either standalone as a script, or that it
+# can be picked up by Twisted's `trial` test wrapper to run all the tests.
+if tcommon.pexpect is not None:
+    if __name__ == '__main__':
+        unittest.main(testLoader=IPDocTestLoader(dt_files,dt_modules))
+    else:
+        testSuite = lambda : makeTestSuite(__name__,dt_files,dt_modules)
diff --git a/IPython/kernel/tests/test_task.py b/IPython/kernel/tests/test_task.py
new file mode 100644
index 0000000..85d3a55
--- /dev/null
+++ b/IPython/kernel/tests/test_task.py
@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+"""This file contains unittests for the kernel.task.py module."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import time
+
+from twisted.internet import defer
+from twisted.trial import unittest
+
+from IPython.kernel import task, controllerservice as cs, engineservice as es
+from IPython.kernel.multiengine import IMultiEngine
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.tests.tasktest import ITaskControllerTestCase
+
+#-------------------------------------------------------------------------------
+# Tests
+#-------------------------------------------------------------------------------
+
+class BasicTaskControllerTestCase(DeferredTestCase, ITaskControllerTestCase):
+    
+    def setUp(self):
+        self.controller  = cs.ControllerService()
+        self.controller.startService()
+        self.multiengine = IMultiEngine(self.controller)
+        self.tc = task.ITaskController(self.controller)
+        self.tc.failurePenalty = 0
+        self.engines=[]
+        
+    def tearDown(self):
+        self.controller.stopService()
+        for e in self.engines:
+            e.stopService()
+
+
diff --git a/IPython/kernel/tests/test_taskfc.py b/IPython/kernel/tests/test_taskfc.py
new file mode 100644
index 0000000..c7d0103
--- /dev/null
+++ b/IPython/kernel/tests/test_taskfc.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import time
+
+from twisted.internet import defer, reactor
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.kernel import task as taskmodule
+from IPython.kernel import controllerservice as cs
+import IPython.kernel.multiengine as me
+from IPython.testutils.util import DeferredTestCase
+from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
+from IPython.kernel.taskfc import IFCTaskController
+from IPython.kernel.util import printer
+from IPython.kernel.tests.tasktest import ITaskControllerTestCase
+from IPython.kernel.clientconnector import ClientConnector
+
+#-------------------------------------------------------------------------------
+# Tests
+#-------------------------------------------------------------------------------
+
+class TaskTest(DeferredTestCase, ITaskControllerTestCase):
+
+    def setUp(self):
+        
+        self.engines = []
+                
+        self.controller = cs.ControllerService()
+        self.controller.startService()
+        self.imultiengine = me.IMultiEngine(self.controller)
+        self.itc = taskmodule.ITaskController(self.controller)
+        self.itc.failurePenalty = 0
+        
+        self.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
+        self.tc_referenceable = IFCTaskController(self.itc)
+        
+        self.controller_tub = Tub()
+        self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
+        self.controller_tub.setLocation('127.0.0.1:10105')
+        
+        mec_furl = self.controller_tub.registerReference(self.mec_referenceable)
+        tc_furl = self.controller_tub.registerReference(self.tc_referenceable)
+        self.controller_tub.startService()
+        
+        self.client_tub = ClientConnector()
+        d = self.client_tub.get_multiengine_client(mec_furl)
+        d.addCallback(self.handle_mec_client)
+        d.addCallback(lambda _: self.client_tub.get_task_client(tc_furl))
+        d.addCallback(self.handle_tc_client)
+        return d
+        
+    def handle_mec_client(self, client):
+        self.multiengine = client
+    
+    def handle_tc_client(self, client):
+        self.tc = client
+    
+    def tearDown(self):
+        dlist = []
+        # Shut down the multiengine client
+        d = self.client_tub.tub.stopService()
+        dlist.append(d)
+        # Shut down the engines
+        for e in self.engines:
+            e.stopService()
+        # Shut down the controller
+        d = self.controller_tub.stopService()
+        d.addBoth(lambda _: self.controller.stopService())
+        dlist.append(d)
+        return defer.DeferredList(dlist)
+
diff --git a/IPython/kernel/twistedutil.py b/IPython/kernel/twistedutil.py
new file mode 100644
index 0000000..6956d38
--- /dev/null
+++ b/IPython/kernel/twistedutil.py
@@ -0,0 +1,206 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Things directly related to all of twisted."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import threading, Queue, atexit
+import twisted
+
+from twisted.internet import defer, reactor
+from twisted.python import log, failure
+
+#-------------------------------------------------------------------------------
+# Classes related to twisted and threads
+#-------------------------------------------------------------------------------
+
+
+class ReactorInThread(threading.Thread):
+    """Run the twisted reactor in a different thread.
+    
+    For the process to be able to exit cleanly, do the following:
+    
+    rit = ReactorInThread()
+    rit.setDaemon(True)
+    rit.start()
+    
+    """
+    
+    def run(self):
+        reactor.run(installSignalHandlers=0)
+        # self.join()
+        
+    def stop(self):
+        # I don't think this does anything useful.
+        blockingCallFromThread(reactor.stop)
+        self.join()
+
+if(twisted.version.major >= 8):
+    import twisted.internet.threads
+    def blockingCallFromThread(f, *a, **kw):
+        """
+        Run a function in the reactor from a thread, and wait for the result
+        synchronously, i.e. until the callback chain returned by the function get a
+        result.
+        
+        Delegates to twisted.internet.threads.blockingCallFromThread(reactor, f, *a, **kw),
+        passing twisted.internet.reactor for the first argument.
+        
+        @param f: the callable to run in the reactor thread
+        @type f: any callable.
+        @param a: the arguments to pass to C{f}.
+        @param kw: the keyword arguments to pass to C{f}.
+
+        @return: the result of the callback chain.
+        @raise: any error raised during the callback chain.
+        """
+        return twisted.internet.threads.blockingCallFromThread(reactor, f, *a, **kw)
+    
+else:   
+    def blockingCallFromThread(f, *a, **kw):
+        """
+        Run a function in the reactor from a thread, and wait for the result
+        synchronously, i.e. until the callback chain returned by the function get a
+        result.
+
+        @param f: the callable to run in the reactor thread
+        @type f: any callable.
+        @param a: the arguments to pass to C{f}.
+        @param kw: the keyword arguments to pass to C{f}.
+
+        @return: the result of the callback chain.
+        @raise: any error raised during the callback chain.
+        """
+        from twisted.internet import reactor
+        queue = Queue.Queue()
+        def _callFromThread():
+            result = defer.maybeDeferred(f, *a, **kw)
+            result.addBoth(queue.put)
+        
+        reactor.callFromThread(_callFromThread)
+        result = queue.get()
+        if isinstance(result, failure.Failure):
+            # This makes it easier for the debugger to get access to the instance
+            try:
+                result.raiseException()
+            except Exception, e:
+                raise e
+        return result
+    
+
+
+#-------------------------------------------------------------------------------
+# Things for managing deferreds
+#-------------------------------------------------------------------------------
+
+
+def parseResults(results):
+    """Pull out results/Failures from a DeferredList."""
+    return [x[1] for x in results]
+
+def gatherBoth(dlist, fireOnOneCallback=0, 
+                      fireOnOneErrback=0,
+                      consumeErrors=0,
+                      logErrors=0):
+    """This is like gatherBoth, but sets consumeErrors=1."""
+    d = DeferredList(dlist, fireOnOneCallback, fireOnOneErrback,
+                     consumeErrors, logErrors)
+    if not fireOnOneCallback:
+        d.addCallback(parseResults)
+    return d
+
+SUCCESS = True
+FAILURE = False
+
+class DeferredList(defer.Deferred):
+    """I combine a group of deferreds into one callback.
+
+    I track a list of L{Deferred}s for their callbacks, and make a single
+    callback when they have all completed, a list of (success, result)
+    tuples, 'success' being a boolean.
+
+    Note that you can still use a L{Deferred} after putting it in a
+    DeferredList.  For example, you can suppress 'Unhandled error in Deferred'
+    messages by adding errbacks to the Deferreds *after* putting them in the
+    DeferredList, as a DeferredList won't swallow the errors.  (Although a more
+    convenient way to do this is simply to set the consumeErrors flag)
+    
+    Note: This is a modified version of the twisted.internet.defer.DeferredList
+    """
+
+    fireOnOneCallback = 0
+    fireOnOneErrback = 0
+
+    def __init__(self, deferredList, fireOnOneCallback=0, fireOnOneErrback=0,
+                 consumeErrors=0, logErrors=0):
+        """Initialize a DeferredList.
+
+        @type deferredList:  C{list} of L{Deferred}s
+        @param deferredList: The list of deferreds to track.
+        @param fireOnOneCallback: (keyword param) a flag indicating that
+                             only one callback needs to be fired for me to call
+                             my callback
+        @param fireOnOneErrback: (keyword param) a flag indicating that
+                            only one errback needs to be fired for me to call
+                            my errback
+        @param consumeErrors: (keyword param) a flag indicating that any errors
+                            raised in the original deferreds should be
+                            consumed by this DeferredList.  This is useful to
+                            prevent spurious warnings being logged.
+        """
+        self.resultList = [None] * len(deferredList)
+        defer.Deferred.__init__(self)
+        if len(deferredList) == 0 and not fireOnOneCallback:
+            self.callback(self.resultList)
+
+        # These flags need to be set *before* attaching callbacks to the
+        # deferreds, because the callbacks use these flags, and will run
+        # synchronously if any of the deferreds are already fired.
+        self.fireOnOneCallback = fireOnOneCallback
+        self.fireOnOneErrback = fireOnOneErrback
+        self.consumeErrors = consumeErrors
+        self.logErrors = logErrors
+        self.finishedCount = 0
+
+        index = 0
+        for deferred in deferredList:
+            deferred.addCallbacks(self._cbDeferred, self._cbDeferred,
+                                  callbackArgs=(index,SUCCESS),
+                                  errbackArgs=(index,FAILURE))
+            index = index + 1
+
+    def _cbDeferred(self, result, index, succeeded):
+        """(internal) Callback for when one of my deferreds fires.
+        """
+        self.resultList[index] = (succeeded, result)
+
+        self.finishedCount += 1
+        if not self.called:
+            if succeeded == SUCCESS and self.fireOnOneCallback:
+                self.callback((result, index))
+            elif succeeded == FAILURE and self.fireOnOneErrback:
+                # We have modified this to fire the errback chain with the actual
+                # Failure instance the originally occured rather than twisted's
+                # FirstError which wraps the failure
+                self.errback(result)
+            elif self.finishedCount == len(self.resultList):
+                self.callback(self.resultList)
+
+        if succeeded == FAILURE and self.logErrors:
+            log.err(result)
+        if succeeded == FAILURE and self.consumeErrors:
+            result = None
+
+        return result
diff --git a/IPython/kernel/util.py b/IPython/kernel/util.py
new file mode 100644
index 0000000..5a5b8eb
--- /dev/null
+++ b/IPython/kernel/util.py
@@ -0,0 +1,102 @@
+# encoding: utf-8
+
+"""General utilities for kernel related things."""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#  Copyright (C) 2008  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+import os, types
+
+
+#-------------------------------------------------------------------------------
+# Code
+#-------------------------------------------------------------------------------
+
+def tarModule(mod):
+    """Makes a tarball (as a string) of a locally imported module.
+        
+    This method looks at the __file__ attribute of an imported module
+    and makes a tarball of the top level of the module.  It then
+    reads the tarball into a binary string.  
+    
+    The method returns the tarball's name and the binary string
+    representing the tarball.
+    
+    Notes:
+    
+    - It will handle both single module files, as well as packages.
+    - The byte code files (\*.pyc) are not deleted.
+    - It has not been tested with modules containing extension code, but 
+      it should work in most cases.
+    - There are cross platform issues. 
+     
+    """
+     
+    if not isinstance(mod, types.ModuleType):
+        raise TypeError, "Pass an imported module to push_module"
+    module_dir, module_file = os.path.split(mod.__file__)
+    
+    # Figure out what the module is called and where it is
+    print "Locating the module..."
+    if "__init__.py" in module_file:  # package
+        module_name = module_dir.split("/")[-1]
+        module_dir = "/".join(module_dir.split("/")[:-1])
+        module_file = module_name
+    else:                             # Simple module
+        module_name = module_file.split(".")[0]
+        module_dir = module_dir
+    print "Module (%s) found in:\n%s" % (module_name, module_dir)
+        
+    # Make a tarball of the module in the cwd
+    if module_dir:
+        os.system('tar -cf %s.tar -C %s %s' % \
+            (module_name, module_dir, module_file))
+    else:   # must be the cwd
+        os.system('tar -cf %s.tar %s' % \
+            (module_name, module_file))
+    
+    # Read the tarball into a binary string        
+    tarball_name = module_name + ".tar"
+    tar_file = open(tarball_name,'rb')
+    fileString = tar_file.read()
+    tar_file.close()
+    
+    # Remove the local copy of the tarball
+    #os.system("rm %s" % tarball_name)
+    
+    return tarball_name, fileString
+
+#from the Python Cookbook:
+
+def curry(f, *curryArgs, **curryKWargs):
+    """Curry the function f with curryArgs and curryKWargs."""
+    
+    def curried(*args, **kwargs):
+        dikt = dict(kwargs)
+        dikt.update(curryKWargs)
+        return f(*(curryArgs+args), **dikt)
+    
+    return curried
+
+#useful callbacks
+
+def catcher(r):
+    pass
+
+def printer(r, msg=''):
+    print "%s\n%r" % (msg, r)
+    return r
+
+
+    
+
diff --git a/IPython/testing/__init__.py b/IPython/testing/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/testing/__init__.py
diff --git a/IPython/testing/ipdoctest.py b/IPython/testing/ipdoctest.py
new file mode 100755
index 0000000..ff91f92
--- /dev/null
+++ b/IPython/testing/ipdoctest.py
@@ -0,0 +1,800 @@
+#!/usr/bin/env python
+"""IPython-enhanced doctest module with unittest integration.
+
+This module is heavily based on the standard library's doctest module, but
+enhances it with IPython support.  This enables docstrings to contain
+unmodified IPython input and output pasted from real IPython sessions.
+
+It should be possible to use this module as a drop-in replacement for doctest
+whenever you wish to use IPython input.
+
+Since the module absorbs all normal doctest functionality, you can use a mix of
+both plain Python and IPython examples in any given module, though not in the
+same docstring.
+
+See a simple example at the bottom of this code which serves as self-test and
+demonstration code.  Simply run this file (use -v for details) to run the
+tests.
+
+This module also contains routines to ease the integration of doctests with
+regular unittest-based testing.  In particular, see the DocTestLoader class and
+the makeTestSuite utility function.
+
+
+Limitations:
+
+ - When generating examples for use as doctests, make sure that you have
+   pretty-printing OFF.  This can be done either by starting ipython with the
+   flag '--nopprint', by setting pprint to 0 in your ipythonrc file, or by
+   interactively disabling it with %Pprint.  This is required so that IPython
+   output matches that of normal Python, which is used by doctest for internal
+   execution.
+
+ - Do not rely on specific prompt numbers for results (such as using
+   '_34==True', for example).  For IPython tests run via an external process
+   the prompt numbers may be different, and IPython tests run as normal python
+   code won't even have these special _NN variables set at all.
+
+ - IPython functions that produce output as a side-effect of calling a system
+   process (e.g. 'ls') can be doc-tested, but they must be handled in an
+   external IPython process.  Such doctests must be tagged with:
+
+        # ipdoctest: EXTERNAL
+
+   so that the testing machinery handles them differently.  Since these are run
+   via pexpect in an external process, they can't deal with exceptions or other
+   fancy featurs of regular doctests.  You must limit such tests to simple
+   matching of the output.  For this reason, I recommend you limit these kinds
+   of doctests to features that truly require a separate process, and use the
+   normal IPython ones (which have all the features of normal doctests) for
+   everything else.  See the examples at the bottom of this file for a
+   comparison of what can be done with both types.
+"""
+
+# Standard library imports
+import __builtin__
+import doctest
+import inspect
+import os
+import re
+import sys
+import unittest
+
+from doctest import *
+
+# Our own imports
+from IPython.tools import utils
+
+###########################################################################
+#
+# We must start our own ipython object and heavily muck with it so that all the
+# modifications IPython makes to system behavior don't send the doctest
+# machinery into a fit.  This code should be considered a gross hack, but it
+# gets the job done.
+
+import IPython
+
+# Hack to restore __main__, which ipython modifies upon startup
+_main = sys.modules.get('__main__')
+ipython = IPython.Shell.IPShell(['--classic','--noterm_title']).IP
+sys.modules['__main__'] = _main
+
+# Deactivate the various python system hooks added by ipython for
+# interactive convenience so we don't confuse the doctest system
+sys.displayhook = sys.__displayhook__
+sys.excepthook = sys.__excepthook__
+
+# So that ipython magics and aliases can be doctested
+__builtin__._ip = IPython.ipapi.get()
+
+# for debugging only!!!
+#from IPython.Shell import IPShellEmbed;ipshell=IPShellEmbed(['--noterm_title']) # dbg
+
+
+# runner
+from IPython.irunner import IPythonRunner
+iprunner = IPythonRunner(echo=False)
+
+###########################################################################
+
+# A simple subclassing of the original with a different class name, so we can
+# distinguish and treat differently IPython examples from pure python ones.
+class IPExample(doctest.Example): pass
+
+class IPExternalExample(doctest.Example):
+    """Doctest examples to be run in an external process."""
+    
+    def __init__(self, source, want, exc_msg=None, lineno=0, indent=0,
+                 options=None):
+        # Parent constructor
+        doctest.Example.__init__(self,source,want,exc_msg,lineno,indent,options)
+
+        # An EXTRA newline is needed to prevent pexpect hangs
+        self.source += '\n'
+
+class IPDocTestParser(doctest.DocTestParser):
+    """
+    A class used to parse strings containing doctest examples.
+
+    Note: This is a version modified to properly recognize IPython input and
+    convert any IPython examples into valid Python ones.
+    """
+    # This regular expression is used to find doctest examples in a
+    # string.  It defines three groups: `source` is the source code
+    # (including leading indentation and prompts); `indent` is the
+    # indentation of the first (PS1) line of the source code; and
+    # `want` is the expected output (including leading indentation).
+
+    # Classic Python prompts or default IPython ones
+    _PS1_PY = r'>>>'
+    _PS2_PY = r'\.\.\.'
+
+    _PS1_IP = r'In\ \[\d+\]:'
+    _PS2_IP = r'\ \ \ \.\.\.+:'
+
+    _RE_TPL = r'''
+        # Source consists of a PS1 line followed by zero or more PS2 lines.
+        (?P<source>
+            (?:^(?P<indent> [ ]*) (?P<ps1> %s) .*)    # PS1 line
+            (?:\n           [ ]*  (?P<ps2> %s) .*)*)  # PS2 lines
+        \n? # a newline
+        # Want consists of any non-blank lines that do not start with PS1.
+        (?P<want> (?:(?![ ]*$)    # Not a blank line
+                     (?![ ]*%s)   # Not a line starting with PS1
+                     (?![ ]*%s)   # Not a line starting with PS2
+                     .*$\n?       # But any other line
+                  )*)
+                  '''
+
+    _EXAMPLE_RE_PY = re.compile( _RE_TPL % (_PS1_PY,_PS2_PY,_PS1_PY,_PS2_PY),
+                                 re.MULTILINE | re.VERBOSE)
+
+    _EXAMPLE_RE_IP = re.compile( _RE_TPL % (_PS1_IP,_PS2_IP,_PS1_IP,_PS2_IP),
+                                 re.MULTILINE | re.VERBOSE)
+
+    def ip2py(self,source):
+        """Convert input IPython source into valid Python."""
+        out = []
+        newline = out.append
+        for line in source.splitlines():
+            newline(ipython.prefilter(line,True))
+        newline('')  # ensure a closing newline, needed by doctest
+        return '\n'.join(out)
+
+    def parse(self, string, name='<string>'):
+        """
+        Divide the given string into examples and intervening text,
+        and return them as a list of alternating Examples and strings.
+        Line numbers for the Examples are 0-based.  The optional
+        argument `name` is a name identifying this string, and is only
+        used for error messages.
+        """
+        string = string.expandtabs()
+        # If all lines begin with the same indentation, then strip it.
+        min_indent = self._min_indent(string)
+        if min_indent > 0:
+            string = '\n'.join([l[min_indent:] for l in string.split('\n')])
+
+        output = []
+        charno, lineno = 0, 0
+
+        # Whether to convert the input from ipython to python syntax
+        ip2py = False
+        # Find all doctest examples in the string.  First, try them as Python
+        # examples, then as IPython ones
+        terms = list(self._EXAMPLE_RE_PY.finditer(string))
+        if terms:
+            # Normal Python example
+            Example = doctest.Example
+        else:
+            # It's an ipython example.  Note that IPExamples are run
+            # in-process, so their syntax must be turned into valid python.
+            # IPExternalExamples are run out-of-process (via pexpect) so they
+            # don't need any filtering (a real ipython will be executing them).
+            terms = list(self._EXAMPLE_RE_IP.finditer(string))
+            if re.search(r'#\s*ipdoctest:\s*EXTERNAL',string):
+                #print '-'*70  # dbg
+                #print 'IPExternalExample, Source:\n',string  # dbg
+                #print '-'*70  # dbg
+                Example = IPExternalExample
+            else:
+                #print '-'*70  # dbg
+                #print 'IPExample, Source:\n',string  # dbg
+                #print '-'*70  # dbg
+                Example = IPExample
+                ip2py = True
+        
+        for m in terms:
+            # Add the pre-example text to `output`.
+            output.append(string[charno:m.start()])
+            # Update lineno (lines before this example)
+            lineno += string.count('\n', charno, m.start())
+            # Extract info from the regexp match.
+            (source, options, want, exc_msg) = \
+                     self._parse_example(m, name, lineno,ip2py)
+            if Example is IPExternalExample:
+                options[doctest.NORMALIZE_WHITESPACE] = True
+            # Create an Example, and add it to the list.
+            if not self._IS_BLANK_OR_COMMENT(source):
+                output.append(Example(source, want, exc_msg,
+                                      lineno=lineno,
+                                      indent=min_indent+len(m.group('indent')),
+                                      options=options))
+            # Update lineno (lines inside this example)
+            lineno += string.count('\n', m.start(), m.end())
+            # Update charno.
+            charno = m.end()
+        # Add any remaining post-example text to `output`.
+        output.append(string[charno:])
+
+        return output
+
+    def _parse_example(self, m, name, lineno,ip2py=False):
+        """
+        Given a regular expression match from `_EXAMPLE_RE` (`m`),
+        return a pair `(source, want)`, where `source` is the matched
+        example's source code (with prompts and indentation stripped);
+        and `want` is the example's expected output (with indentation
+        stripped).
+
+        `name` is the string's name, and `lineno` is the line number
+        where the example starts; both are used for error messages.
+
+        Optional:
+        `ip2py`: if true, filter the input via IPython to convert the syntax
+        into valid python.
+        """
+        
+        # Get the example's indentation level.
+        indent = len(m.group('indent'))
+
+        # Divide source into lines; check that they're properly
+        # indented; and then strip their indentation & prompts.
+        source_lines = m.group('source').split('\n')
+
+        # We're using variable-length input prompts
+        ps1 = m.group('ps1')
+        ps2 = m.group('ps2')
+        ps1_len = len(ps1)
+
+        self._check_prompt_blank(source_lines, indent, name, lineno,ps1_len)
+        if ps2:
+            self._check_prefix(source_lines[1:], ' '*indent + ps2, name, lineno)
+
+        source = '\n'.join([sl[indent+ps1_len+1:] for sl in source_lines])
+
+        if ip2py:
+            # Convert source input from IPython into valid Python syntax
+            source = self.ip2py(source)
+
+        # Divide want into lines; check that it's properly indented; and
+        # then strip the indentation.  Spaces before the last newline should
+        # be preserved, so plain rstrip() isn't good enough.
+        want = m.group('want')
+        want_lines = want.split('\n')
+        if len(want_lines) > 1 and re.match(r' *$', want_lines[-1]):
+            del want_lines[-1]  # forget final newline & spaces after it
+        self._check_prefix(want_lines, ' '*indent, name,
+                           lineno + len(source_lines))
+
+        # Remove ipython output prompt that might be present in the first line
+        want_lines[0] = re.sub(r'Out\[\d+\]: \s*?\n?','',want_lines[0])
+
+        want = '\n'.join([wl[indent:] for wl in want_lines])
+
+        # If `want` contains a traceback message, then extract it.
+        m = self._EXCEPTION_RE.match(want)
+        if m:
+            exc_msg = m.group('msg')
+        else:
+            exc_msg = None
+
+        # Extract options from the source.
+        options = self._find_options(source, name, lineno)
+
+        return source, options, want, exc_msg
+
+    def _check_prompt_blank(self, lines, indent, name, lineno, ps1_len):
+        """
+        Given the lines of a source string (including prompts and
+        leading indentation), check to make sure that every prompt is
+        followed by a space character.  If any line is not followed by
+        a space character, then raise ValueError.
+
+        Note: IPython-modified version which takes the input prompt length as a
+        parameter, so that prompts of variable length can be dealt with.
+        """
+        space_idx = indent+ps1_len
+        min_len = space_idx+1
+        for i, line in enumerate(lines):
+            if len(line) >=  min_len and line[space_idx] != ' ':
+                raise ValueError('line %r of the docstring for %s '
+                                 'lacks blank after %s: %r' %
+                                 (lineno+i+1, name,
+                                  line[indent:space_idx], line))
+
+
+SKIP = register_optionflag('SKIP')
+
+class IPDocTestRunner(doctest.DocTestRunner):
+    """Modified DocTestRunner which can also run IPython tests.
+
+    This runner is capable of handling IPython doctests that require
+    out-of-process output capture (such as system calls via !cmd or aliases).
+    Note however that because these tests are run in a separate process, many
+    of doctest's fancier capabilities (such as detailed exception analysis) are
+    not available.  So try to limit such tests to simple cases of matching
+    actual output.
+    """
+    
+    #/////////////////////////////////////////////////////////////////
+    # DocTest Running
+    #/////////////////////////////////////////////////////////////////
+
+    def _run_iptest(self, test, out):
+        """
+        Run the examples in `test`.  Write the outcome of each example with one
+        of the `DocTestRunner.report_*` methods, using the writer function
+        `out`.  Return a tuple `(f, t)`, where `t` is the number of examples
+        tried, and `f` is the number of examples that failed.  The examples are
+        run in the namespace `test.globs`.
+
+        IPython note: this is a modified version of the original __run()
+        private method to handle out-of-process examples.
+        """
+
+        if out is None:
+            out = sys.stdout.write
+
+        # Keep track of the number of failures and tries.
+        failures = tries = 0
+
+        # Save the option flags (since option directives can be used
+        # to modify them).
+        original_optionflags = self.optionflags
+
+        SUCCESS, FAILURE, BOOM = range(3) # `outcome` state
+
+        check = self._checker.check_output
+
+        # Process each example.
+        for examplenum, example in enumerate(test.examples):
+
+            # If REPORT_ONLY_FIRST_FAILURE is set, then supress
+            # reporting after the first failure.
+            quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
+                     failures > 0)
+
+            # Merge in the example's options.
+            self.optionflags = original_optionflags
+            if example.options:
+                for (optionflag, val) in example.options.items():
+                    if val:
+                        self.optionflags |= optionflag
+                    else:
+                        self.optionflags &= ~optionflag
+
+            # If 'SKIP' is set, then skip this example.
+            if self.optionflags & SKIP:
+                continue
+
+            # Record that we started this example.
+            tries += 1
+            if not quiet:
+                self.report_start(out, test, example)
+
+            # Run the example in the given context (globs), and record
+            # any exception that gets raised.  (But don't intercept
+            # keyboard interrupts.)
+            try:
+                # Don't blink!  This is where the user's code gets run.
+                got = ''
+                # The code is run in an external process
+                got = iprunner.run_source(example.source,get_output=True)
+            except KeyboardInterrupt:
+                raise
+            except:
+                self.debugger.set_continue() # ==== Example Finished ====
+
+            outcome = FAILURE   # guilty until proved innocent or insane
+
+            if check(example.want, got, self.optionflags):
+                outcome = SUCCESS
+
+            # Report the outcome.
+            if outcome is SUCCESS:
+                if not quiet:
+                    self.report_success(out, test, example, got)
+            elif outcome is FAILURE:
+                if not quiet:
+                    self.report_failure(out, test, example, got)
+                failures += 1
+            elif outcome is BOOM:
+                if not quiet:
+                    self.report_unexpected_exception(out, test, example,
+                                                     exc_info)
+                failures += 1
+            else:
+                assert False, ("unknown outcome", outcome)
+
+        # Restore the option flags (in case they were modified)
+        self.optionflags = original_optionflags
+
+        # Record and return the number of failures and tries.
+
+        # Hack to access a parent private method by working around Python's
+        # name mangling (which is fortunately simple).
+        doctest.DocTestRunner._DocTestRunner__record_outcome(self,test,
+                                                             failures, tries)
+        return failures, tries
+
+    def run(self, test, compileflags=None, out=None, clear_globs=True):
+        """Run examples in `test`.
+
+        This method will defer to the parent for normal Python examples, but it
+        will run IPython ones via pexpect.
+        """
+        if not test.examples:
+            return
+        
+        if isinstance(test.examples[0],IPExternalExample):
+            self._run_iptest(test,out)
+        else:
+            DocTestRunner.run(self,test,compileflags,out,clear_globs)
+
+
+class IPDebugRunner(IPDocTestRunner,doctest.DebugRunner):
+    """IPython-modified DebugRunner, see the original class for details."""
+    
+    def run(self, test, compileflags=None, out=None, clear_globs=True):
+        r = IPDocTestRunner.run(self, test, compileflags, out, False)
+        if clear_globs:
+            test.globs.clear()
+        return r
+
+
+class IPDocTestLoader(unittest.TestLoader):
+    """A test loader with IPython-enhanced doctest support.
+
+    Instances of this loader will automatically add doctests found in a module
+    to the test suite returned by the loadTestsFromModule method.  In
+    addition, at initialization time a string of doctests can be given to the
+    loader, enabling it to add doctests to a module which didn't have them in
+    its docstring, coming from an external source."""
+
+    
+    def __init__(self,dt_files=None,dt_modules=None,test_finder=None):
+        """Initialize the test loader.
+
+        :Keywords:
+
+          dt_files : list (None)
+            List of names of files to be executed as doctests.
+            
+          dt_modules : list (None)
+            List of module names to be scanned for doctests in their
+            docstrings. 
+
+          test_finder : instance (None)
+            Instance of a testfinder (see doctest for details).
+        """
+
+        if dt_files is None: dt_files = []
+        if dt_modules is None: dt_modules = []
+        self.dt_files = utils.list_strings(dt_files)
+        self.dt_modules = utils.list_strings(dt_modules)
+        if test_finder is None:
+            test_finder = doctest.DocTestFinder(parser=IPDocTestParser())
+        self.test_finder = test_finder
+
+    def loadTestsFromModule(self, module):
+        """Return a suite of all tests cases contained in the given module.
+
+        If the loader was initialized with a doctests argument, then this
+        string is assigned as the module's docstring."""
+
+        # Start by loading any tests in the called module itself
+        suite = super(self.__class__,self).loadTestsFromModule(module)
+
+        # Now, load also tests referenced at construction time as companion
+        # doctests that reside in standalone files
+        for fname in self.dt_files:
+            #print 'mod:',module  # dbg
+            #print 'fname:',fname  # dbg
+            #suite.addTest(doctest.DocFileSuite(fname))
+            suite.addTest(doctest.DocFileSuite(fname,module_relative=False))
+        # Add docstring tests from module, if given at construction time
+        for mod in self.dt_modules:
+            suite.addTest(doctest.DocTestSuite(mod,
+                                               test_finder=self.test_finder))
+
+        #ipshell()  # dbg
+        return suite
+
+def my_import(name):
+    """Module importer - taken from the python documentation.
+
+    This function allows importing names with dots in them."""
+    
+    mod = __import__(name)
+    components = name.split('.')
+    for comp in components[1:]:
+        mod = getattr(mod, comp)
+    return mod
+
+def makeTestSuite(module_name,dt_files=None,dt_modules=None,idt=True):
+    """Make a TestSuite object for a given module, specified by name.
+
+    This extracts all the doctests associated with a module using a
+    DocTestLoader object.
+
+    :Parameters:
+
+      - module_name: a string containing the name of a module with unittests.
+
+    :Keywords:
+
+      dt_files : list of strings
+        List of names of plain text files to be treated as doctests.
+
+      dt_modules : list of strings
+        List of names of modules to be scanned for doctests in docstrings.
+
+      idt : bool (True)
+        If True, return integrated doctests.  This means that each filename
+        listed in dt_files is turned into a *single* unittest, suitable for
+        running via unittest's runner or Twisted's Trial runner.  If false, the
+        dt_files parameter is returned unmodified, so that other test runners
+        (such as oilrun) can run the doctests with finer granularity.
+    """
+
+    mod = my_import(module_name)
+    if idt:
+        suite = IPDocTestLoader(dt_files,dt_modules).loadTestsFromModule(mod)
+    else:
+        suite = IPDocTestLoader(None,dt_modules).loadTestsFromModule(mod)
+        
+    if idt:
+        return suite
+    else:
+        return suite,dt_files
+
+# Copied from doctest in py2.5 and modified for our purposes (since they don't
+# parametrize what we need)
+
+# For backward compatibility, a global instance of a DocTestRunner
+# class, updated by testmod.
+master = None
+
+def testmod(m=None, name=None, globs=None, verbose=None,
+            report=True, optionflags=0, extraglobs=None,
+            raise_on_error=False, exclude_empty=False):
+    """m=None, name=None, globs=None, verbose=None, report=True,
+       optionflags=0, extraglobs=None, raise_on_error=False,
+       exclude_empty=False
+
+    Note: IPython-modified version which loads test finder and runners that
+    recognize IPython syntax in doctests.
+
+    Test examples in docstrings in functions and classes reachable
+    from module m (or the current module if m is not supplied), starting
+    with m.__doc__.
+
+    Also test examples reachable from dict m.__test__ if it exists and is
+    not None.  m.__test__ maps names to functions, classes and strings;
+    function and class docstrings are tested even if the name is private;
+    strings are tested directly, as if they were docstrings.
+
+    Return (#failures, #tests).
+
+    See doctest.__doc__ for an overview.
+
+    Optional keyword arg "name" gives the name of the module; by default
+    use m.__name__.
+
+    Optional keyword arg "globs" gives a dict to be used as the globals
+    when executing examples; by default, use m.__dict__.  A copy of this
+    dict is actually used for each docstring, so that each docstring's
+    examples start with a clean slate.
+
+    Optional keyword arg "extraglobs" gives a dictionary that should be
+    merged into the globals that are used to execute examples.  By
+    default, no extra globals are used.  This is new in 2.4.
+
+    Optional keyword arg "verbose" prints lots of stuff if true, prints
+    only failures if false; by default, it's true iff "-v" is in sys.argv.
+
+    Optional keyword arg "report" prints a summary at the end when true,
+    else prints nothing at the end.  In verbose mode, the summary is
+    detailed, else very brief (in fact, empty if all tests passed).
+
+    Optional keyword arg "optionflags" or's together module constants,
+    and defaults to 0.  This is new in 2.3.  Possible values (see the
+    docs for details):
+
+        DONT_ACCEPT_TRUE_FOR_1
+        DONT_ACCEPT_BLANKLINE
+        NORMALIZE_WHITESPACE
+        ELLIPSIS
+        SKIP
+        IGNORE_EXCEPTION_DETAIL
+        REPORT_UDIFF
+        REPORT_CDIFF
+        REPORT_NDIFF
+        REPORT_ONLY_FIRST_FAILURE
+
+    Optional keyword arg "raise_on_error" raises an exception on the
+    first unexpected exception or failure. This allows failures to be
+    post-mortem debugged.
+
+    Advanced tomfoolery:  testmod runs methods of a local instance of
+    class doctest.Tester, then merges the results into (or creates)
+    global Tester instance doctest.master.  Methods of doctest.master
+    can be called directly too, if you want to do something unusual.
+    Passing report=0 to testmod is especially useful then, to delay
+    displaying a summary.  Invoke doctest.master.summarize(verbose)
+    when you're done fiddling.
+    """
+    global master
+
+    # If no module was given, then use __main__.
+    if m is None:
+        # DWA - m will still be None if this wasn't invoked from the command
+        # line, in which case the following TypeError is about as good an error
+        # as we should expect
+        m = sys.modules.get('__main__')
+
+    # Check that we were actually given a module.
+    if not inspect.ismodule(m):
+        raise TypeError("testmod: module required; %r" % (m,))
+
+    # If no name was given, then use the module's name.
+    if name is None:
+        name = m.__name__
+
+    #----------------------------------------------------------------------
+    # fperez - make IPython finder and runner:
+    # Find, parse, and run all tests in the given module.
+    finder = DocTestFinder(exclude_empty=exclude_empty,
+                           parser=IPDocTestParser())
+
+    if raise_on_error:
+        runner = IPDebugRunner(verbose=verbose, optionflags=optionflags)
+    else:
+        runner = IPDocTestRunner(verbose=verbose, optionflags=optionflags,
+                                 #checker=IPOutputChecker()  # dbg
+                                 )
+
+    # /fperez - end of ipython changes
+    #----------------------------------------------------------------------
+
+    for test in finder.find(m, name, globs=globs, extraglobs=extraglobs):
+        runner.run(test)
+
+    if report:
+        runner.summarize()
+
+    if master is None:
+        master = runner
+    else:
+        master.merge(runner)
+
+    return runner.failures, runner.tries
+
+
+# Simple testing and example code
+if __name__ == "__main__":
+    
+    def ipfunc():
+        """
+        Some ipython tests...
+
+        In [1]: import os
+
+        In [2]: cd /
+        /
+
+        In [3]: 2+3
+        Out[3]: 5
+
+        In [26]: for i in range(3):
+           ....:     print i,
+           ....:     print i+1,
+           ....:
+        0 1 1 2 2 3
+
+
+        Examples that access the operating system work:
+        
+        In [19]: cd /tmp
+        /tmp
+
+        In [20]: mkdir foo_ipython
+
+        In [21]: cd foo_ipython
+        /tmp/foo_ipython
+
+        In [23]: !touch bar baz
+
+        # We unfortunately can't just call 'ls' because its output is not
+        # seen by doctest, since it happens in a separate process
+        
+        In [24]: os.listdir('.')
+        Out[24]: ['bar', 'baz']
+
+        In [25]: cd /tmp
+        /tmp
+
+        In [26]: rm -rf foo_ipython
+
+
+        It's OK to use '_' for the last result, but do NOT try to use IPython's
+        numbered history of _NN outputs, since those won't exist under the
+        doctest environment:
+        
+        In [7]: 3+4
+        Out[7]: 7
+
+        In [8]: _+3
+        Out[8]: 10
+        """
+
+    def ipfunc_external():
+        """
+        Tests that must be run in an external process
+
+
+        # ipdoctest: EXTERNAL
+
+        In [11]: for i in range(10):
+           ....:     print i,
+           ....:     print i+1,
+           ....:
+        0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10
+
+
+        In [1]: import os
+
+        In [1]: print "hello"
+        hello
+        
+        In [19]: cd /tmp
+        /tmp
+
+        In [20]: mkdir foo_ipython2
+
+        In [21]: cd foo_ipython2
+        /tmp/foo_ipython2
+
+        In [23]: !touch bar baz
+
+        In [24]: ls
+        bar  baz
+
+        In [24]: !ls
+        bar  baz
+
+        In [25]: cd /tmp
+        /tmp
+
+        In [26]: rm -rf foo_ipython2
+        """
+
+    def pyfunc():
+        """
+        Some pure python tests...
+
+        >>> import os
+
+        >>> 2+3
+        5
+
+        >>> for i in range(3):
+        ...     print i,
+        ...     print i+1,
+        ...
+        0 1 1 2 2 3
+        """
+
+    # Call the global testmod() just like you would with normal doctest
+    testmod()
diff --git a/IPython/testing/mkdoctests.py b/IPython/testing/mkdoctests.py
new file mode 100755
index 0000000..142f1cc
--- /dev/null
+++ b/IPython/testing/mkdoctests.py
@@ -0,0 +1,244 @@
+#!/usr/bin/env python
+"""Utility for making a doctest file out of Python or IPython input.
+
+  %prog [options] input_file [output_file]
+
+This script is a convenient generator of doctest files that uses IPython's
+irunner script to execute valid Python or IPython input in a separate process,
+capture all of the output, and write it to an output file.
+
+It can be used in one of two ways:
+
+1. With a plain Python or IPython input file (denoted by extensions '.py' or
+   '.ipy'.  In this case, the output is an auto-generated reST file with a
+   basic header, and the captured Python input and output contained in an
+   indented code block.
+
+   If no output filename is given, the input name is used, with the extension
+   replaced by '.txt'.
+
+2. With an input template file.  Template files are simply plain text files
+   with special directives of the form
+
+   %run filename
+
+   to include the named file at that point.
+
+   If no output filename is given and the input filename is of the form
+   'base.tpl.txt', the output will be automatically named 'base.txt'.
+"""
+
+# Standard library imports
+
+import optparse
+import os
+import re
+import sys
+import tempfile
+
+# IPython-specific libraries
+from IPython import irunner
+from IPython.genutils import fatal
+
+class IndentOut(object):
+    """A simple output stream that indents all output by a fixed amount.
+
+    Instances of this class trap output to a given stream and first reformat it
+    to indent every input line."""
+    
+    def __init__(self,out=sys.stdout,indent=4):
+        """Create an indented writer.
+
+        :Keywords:
+
+        - `out` : stream (sys.stdout)
+          Output stream to actually write to after indenting.
+
+        - `indent` : int
+          Number of spaces to indent every input line by.
+        """
+        
+        self.indent_text = ' '*indent
+        self.indent = re.compile('^',re.MULTILINE).sub
+        self.out = out
+        self._write = out.write
+        self.buffer = []
+        self._closed = False
+
+    def write(self,data):
+        """Write a string to the output stream."""
+
+        if self._closed:
+            raise ValueError('I/O operation on closed file')
+        self.buffer.append(data)
+
+    def flush(self):
+        if self.buffer:
+            data = ''.join(self.buffer)
+            self.buffer[:] = []
+            self._write(self.indent(self.indent_text,data))
+        
+    def close(self):
+        self.flush()
+        self._closed = True
+
+class RunnerFactory(object):
+    """Code runner factory.
+
+    This class provides an IPython code runner, but enforces that only one
+    runner is every instantiated.  The runner is created based on the extension
+    of the first file to run, and it raises an exception if a runner is later
+    requested for a different extension type.
+
+    This ensures that we don't generate example files for doctest with a mix of
+    python and ipython syntax.
+    """
+
+    def __init__(self,out=sys.stdout):
+        """Instantiate a code runner."""
+        
+        self.out = out
+        self.runner = None
+        self.runnerClass = None
+
+    def _makeRunner(self,runnerClass):
+        self.runnerClass = runnerClass
+        self.runner = runnerClass(out=self.out)
+        return self.runner
+          
+    def __call__(self,fname):
+        """Return a runner for the given filename."""
+
+        if fname.endswith('.py'):
+            runnerClass = irunner.PythonRunner
+        elif fname.endswith('.ipy'):
+            runnerClass = irunner.IPythonRunner
+        else:
+            raise ValueError('Unknown file type for Runner: %r' % fname)
+
+        if self.runner is None:
+            return self._makeRunner(runnerClass)
+        else:
+            if runnerClass==self.runnerClass:
+                return self.runner
+            else:
+                e='A runner of type %r can not run file %r' % \
+                   (self.runnerClass,fname)
+                raise ValueError(e)
+
+TPL = """
+=========================
+ Auto-generated doctests
+=========================
+
+This file was auto-generated by IPython in its entirety.  If you need finer
+control over the contents, simply make a manual template.  See the
+mkdoctests.py script for details.
+
+%%run %s
+"""
+
+def main():
+    """Run as a script."""
+
+    # Parse options and arguments.
+    parser = optparse.OptionParser(usage=__doc__)
+    newopt = parser.add_option
+    newopt('-f','--force',action='store_true',dest='force',default=False,
+           help='Force overwriting of the output file.')
+    newopt('-s','--stdout',action='store_true',dest='stdout',default=False,
+           help='Use stdout instead of a file for output.')
+
+    opts,args = parser.parse_args()
+    if len(args) < 1:
+        parser.error("incorrect number of arguments")
+
+    # Input filename
+    fname = args[0]
+
+    # We auto-generate the output file based on a trivial template to make it
+    # really easy to create simple doctests.
+
+    auto_gen_output = False
+    try:
+        outfname = args[1]
+    except IndexError:
+        outfname = None
+
+    if fname.endswith('.tpl.txt') and outfname is None:
+        outfname = fname.replace('.tpl.txt','.txt')
+    else:
+        bname, ext = os.path.splitext(fname)
+        if ext in ['.py','.ipy']:
+            auto_gen_output = True
+        if outfname is None:
+            outfname = bname+'.txt'
+
+    # Open input file
+
+    # In auto-gen mode, we actually change the name of the input file to be our
+    # auto-generated template
+    if auto_gen_output:
+        infile = tempfile.TemporaryFile()
+        infile.write(TPL % fname)
+        infile.flush()
+        infile.seek(0)
+    else:
+        infile = open(fname)
+
+    # Now open the output file.  If opts.stdout was given, this overrides any
+    # explicit choice of output filename and just directs all output to
+    # stdout.
+    if opts.stdout:
+        outfile = sys.stdout
+    else:
+        # Argument processing finished, start main code
+        if os.path.isfile(outfname) and not opts.force:
+            fatal("Output file %r exists, use --force (-f) to overwrite."
+                  % outfname)
+        outfile = open(outfname,'w')
+
+
+    # all output from included files will be indented 
+    indentOut = IndentOut(outfile,4)
+    getRunner = RunnerFactory(indentOut)
+
+    # Marker in reST for transition lines
+    rst_transition = '\n'+'-'*76+'\n\n'
+
+    # local shorthand for loop
+    write = outfile.write
+
+    # Process input, simply writing back out all normal lines and executing the
+    # files in lines marked as '%run filename'.
+    for line in infile:
+        if line.startswith('%run '):
+            # We don't support files with spaces in their names.
+            incfname = line.split()[1]
+
+            # We make the output of the included file appear bracketed between
+            # clear reST transition marks, and indent it so that if anyone
+            # makes an HTML or PDF out of the file, all doctest input and
+            # output appears in proper literal blocks.
+            write(rst_transition)
+            write('Begin included file %s::\n\n' % incfname)
+
+            # I deliberately do NOT trap any exceptions here, so that if
+            # there's any problem, the user running this at the command line
+            # finds out immediately by the code blowing up, rather than ending
+            # up silently with an incomplete or incorrect file.
+            getRunner(incfname).run_file(incfname)
+
+            write('\nEnd included file %s\n' % incfname)
+            write(rst_transition)
+        else:
+            # The rest of the input file is just written out
+            write(line)
+    infile.close()
+
+    # Don't close sys.stdout!!!
+    if outfile is not sys.stdout:
+        outfile.close()
+
+if __name__ == '__main__':
+    main()
diff --git a/IPython/testing/parametric.py b/IPython/testing/parametric.py
new file mode 100644
index 0000000..cd2bf81
--- /dev/null
+++ b/IPython/testing/parametric.py
@@ -0,0 +1,55 @@
+"""Parametric testing on top of twisted.trial.unittest.
+
+"""
+
+__all__ = ['parametric','Parametric']
+
+from twisted.trial.unittest import TestCase
+
+def partial(f, *partial_args, **partial_kwargs):
+    """Generate a partial class method.
+
+    """
+    def partial_func(self, *args, **kwargs):
+        dikt = dict(kwargs)
+        dikt.update(partial_kwargs)
+        return f(self, *(partial_args+args), **dikt)
+
+    return partial_func
+
+def parametric(f):
+    """Mark f as a parametric test.
+
+    """
+    f._parametric = True
+    return classmethod(f)
+
+def Parametric(cls):
+    """Register parametric tests with a class.
+
+    """
+    # Walk over all tests marked with @parametric
+    test_generators = [getattr(cls,f) for f in dir(cls)
+                    if f.startswith('test')]
+    test_generators = [m for m in test_generators if hasattr(m,'_parametric')]
+    for test_gen in test_generators:
+        test_name = test_gen.func_name
+
+        # Insert a new test for each parameter
+        for n,test_and_params in enumerate(test_gen()):
+            test_method = test_and_params[0]
+            test_params = test_and_params[1:]
+
+            # Here we use partial (defined above), which returns a
+            # class method of type ``types.FunctionType``, unlike
+            # functools.partial which returns a function of type
+            # ``functools.partial``.
+            partial_func = partial(test_method,*test_params)
+            # rename the test to look like a testcase
+            partial_func.__name__ = 'test_' + partial_func.__name__
+
+            # insert the new function into the class as a test
+            setattr(cls, test_name + '_%s' % n, partial_func)
+
+        # rename test generator so it isn't called again by nose
+        test_gen.im_func.func_name = '__done_' + test_name
diff --git a/IPython/testing/tcommon.py b/IPython/testing/tcommon.py
new file mode 100644
index 0000000..f4b7bcc
--- /dev/null
+++ b/IPython/testing/tcommon.py
@@ -0,0 +1,36 @@
+"""Common utilities for testing IPython.
+
+This file is meant to be used as
+
+from IPython.testutils.tcommon import *
+
+by any test code.
+
+While a bit ugly, this helps us keep all testing facilities in one place, and
+start coding standalone test scripts easily, which can then be pasted into the
+larger test suites without any modifications required.
+"""
+
+# Required modules and packages
+
+# Standard Python lib
+import cPickle as pickle
+import doctest
+import math
+import os
+import sys
+import unittest
+
+from pprint import pformat, pprint
+
+# From the IPython test lib
+import tutils
+from tutils import fullPath
+
+try:
+    import pexpect
+except ImportError:
+    pexpect = None
+else:
+    from IPython.testutils.ipdoctest import IPDocTestLoader,makeTestSuite
+    
diff --git a/IPython/testing/testTEMPLATE.py b/IPython/testing/testTEMPLATE.py
new file mode 100755
index 0000000..c9b07c7
--- /dev/null
+++ b/IPython/testing/testTEMPLATE.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""Simple template for unit tests.
+
+This file should be renamed to
+
+test_FEATURE.py
+
+so that it is recognized by the overall test driver (Twisted's 'trial'), which
+looks for all test_*.py files in the current directory to extract tests from
+them.
+"""
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+
+#-------------------------------------------------------------------------------
+# Setup for inline and standalone doctests
+#-------------------------------------------------------------------------------
+
+
+# If you have standalone doctests in a separate file, set their names in the
+# dt_files variable (as a single string  or a list thereof).  The mkPath call
+# forms an absolute path based on the current file, it is not needed if you
+# provide the full pahts.
+dt_files = fullPath(__file__,[])
+
+
+# If you have any modules whose docstrings should be scanned for embedded tests
+# as examples accorging to standard doctest practice, set them here (as a
+# single string or a list thereof):
+dt_modules = []
+
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+class FooTestCase(unittest.TestCase):
+    def test_foo(self):
+        pass
+        
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+# This ensures that the code will run either standalone as a script, or that it
+# can be picked up by Twisted's `trial` test wrapper to run all the tests.
+if tcommon.pexpect is not None:
+    if __name__ == '__main__':
+        unittest.main(testLoader=IPDocTestLoader(dt_files,dt_modules))
+    else:
+        testSuite = lambda : makeTestSuite(__name__,dt_files,dt_modules)
diff --git a/IPython/testing/tests/__init__.py b/IPython/testing/tests/__init__.py
new file mode 100644
index 0000000..f751f68
--- /dev/null
+++ b/IPython/testing/tests/__init__.py
@@ -0,0 +1,10 @@
+# encoding: utf-8
+__docformat__ = "restructuredtext en"
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
diff --git a/IPython/testing/tests/test_testutils.py b/IPython/testing/tests/test_testutils.py
new file mode 100755
index 0000000..2933f90
--- /dev/null
+++ b/IPython/testing/tests/test_testutils.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""Simple template for unit tests.
+
+This file should be renamed to
+
+test_FEATURE.py
+
+so that it is recognized by the overall test driver (Twisted's 'trial'), which
+looks for all test_*.py files in the current directory to extract tests from
+them.
+"""
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+
+#-------------------------------------------------------------------------------
+# Setup for inline and standalone doctests
+#-------------------------------------------------------------------------------
+
+
+# If you have standalone doctests in a separate file, set their names in the
+# dt_files variable (as a single string  or a list thereof).  The mkPath call
+# forms an absolute path based on the current file, it is not needed if you
+# provide the full pahts.
+dt_files = fullPath(__file__,[])
+
+
+# If you have any modules whose docstrings should be scanned for embedded tests
+# as examples accorging to standard doctest practice, set them here (as a
+# single string or a list thereof):
+dt_modules = ['IPython.testutils.tutils']
+
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+## class FooTestCase(unittest.TestCase):
+##     def test_foo(self):
+##         pass
+        
+#-------------------------------------------------------------------------------
+# Regular Unittests
+#-------------------------------------------------------------------------------
+
+# This ensures that the code will run either standalone as a script, or that it
+# can be picked up by Twisted's `trial` test wrapper to run all the tests.
+if tcommon.pexpect is not None:
+    if __name__ == '__main__':
+        unittest.main(testLoader=IPDocTestLoader(dt_files,dt_modules))
+    else:
+        testSuite = lambda : makeTestSuite(__name__,dt_files,dt_modules)
diff --git a/IPython/testing/tstTEMPLATE_doctest.py b/IPython/testing/tstTEMPLATE_doctest.py
new file mode 100644
index 0000000..0e2d427
--- /dev/null
+++ b/IPython/testing/tstTEMPLATE_doctest.py
@@ -0,0 +1,16 @@
+"""Run this file with
+
+    irunner --python filename
+
+to generate valid doctest input.
+
+NOTE: make sure to ALWAYS have a blank line before comments, otherwise doctest
+gets confused."""
+
+#---------------------------------------------------------------------------
+
+# Setup - all imports are done in tcommon
+import tcommon; reload(tcommon)  # for interactive use
+from IPython.testutils.tcommon import *
+
+# Doctest code begins here
diff --git a/IPython/testing/tstTEMPLATE_doctest.txt b/IPython/testing/tstTEMPLATE_doctest.txt
new file mode 100644
index 0000000..880d540
--- /dev/null
+++ b/IPython/testing/tstTEMPLATE_doctest.txt
@@ -0,0 +1,24 @@
+Doctests for the ``XXX`` module
+=====================================
+
+The way doctest loads these, the entire document is applied as a single test
+rather than multiple individual ones, unfortunately.
+
+
+Auto-generated tests
+--------------------
+
+The tests below are generated from the companion file
+test_toeplitz_doctest.py, which is run via IPython's irunner script to create
+valid doctest input automatically.
+
+# Setup - all imports are done in tcommon
+>>> from IPython.testutils.tcommon import *
+
+# Rest of doctest goes here...
+
+
+Manually generated tests
+------------------------
+
+These are one-off tests written by hand, copied from an interactive prompt.
diff --git a/IPython/testing/tutils.py b/IPython/testing/tutils.py
new file mode 100644
index 0000000..6bb14b4
--- /dev/null
+++ b/IPython/testing/tutils.py
@@ -0,0 +1,72 @@
+"""Utilities for testing code.
+"""
+
+# Required modules and packages
+
+# Standard Python lib
+import os
+import sys
+
+# From this project
+from IPython.tools import utils
+
+# path to our own installation, so we can find source files under this.
+TEST_PATH = os.path.dirname(os.path.abspath(__file__))
+
+# Global flag, used by vprint
+VERBOSE = '-v' in sys.argv or '--verbose' in sys.argv
+
+##########################################################################
+# Code begins
+
+# Some utility functions
+def vprint(*args):
+    """Print-like function which relies on a global VERBOSE flag."""
+    if not VERBOSE:
+        return
+
+    write = sys.stdout.write
+    for item in args:
+        write(str(item))
+    write('\n')
+    sys.stdout.flush()
+
+def test_path(path):
+    """Return a path as a subdir of the test package.
+
+    This finds the correct path of the test package on disk, and prepends it
+    to the input path."""
+    
+    return os.path.join(TEST_PATH,path)
+
+def fullPath(startPath,files):
+    """Make full paths for all the listed files, based on startPath.
+
+    Only the base part of startPath is kept, since this routine is typically
+    used with a script's __file__ variable as startPath.  The base of startPath
+    is then prepended to all the listed files, forming the output list.
+
+    :Parameters:
+      startPath : string
+        Initial path to use as the base for the results.  This path is split
+      using os.path.split() and only its first component is kept.
+
+      files : string or list
+        One or more files.
+
+    :Examples:
+    
+    >>> fullPath('/foo/bar.py',['a.txt','b.txt'])
+    ['/foo/a.txt', '/foo/b.txt']
+
+    >>> fullPath('/foo',['a.txt','b.txt'])
+    ['/a.txt', '/b.txt']
+
+    If a single file is given, the output is still a list:
+    >>> fullPath('/foo','a.txt')
+    ['/a.txt']
+    """
+    
+    files = utils.list_strings(files)
+    base = os.path.split(startPath)[0]
+    return [ os.path.join(base,f) for f in files ]
diff --git a/IPython/testing/util.py b/IPython/testing/util.py
new file mode 100644
index 0000000..7036650
--- /dev/null
+++ b/IPython/testing/util.py
@@ -0,0 +1,64 @@
+# encoding: utf-8
+"""This file contains utility classes for performing tests with Deferreds.
+"""
+__docformat__ = "restructuredtext en"
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Imports
+#-------------------------------------------------------------------------------
+
+from twisted.trial import unittest
+from twisted.internet import defer
+
+class DeferredTestCase(unittest.TestCase):
+    
+    def assertDeferredEquals(self, deferred, expectedResult,
+	                              chainDeferred=None):
+        """Calls assertEquals on the result of the deferred and expectedResult.
+        
+        chainDeferred can be used to pass in previous Deferred objects that
+        have tests being run on them.  This chaining of Deferred's in tests
+        is needed to insure that all Deferred's are cleaned up at the end of
+        a test.
+        """
+        
+        if chainDeferred is None:
+            chainDeferred = defer.succeed(None)
+	       
+        def gotResult(actualResult):
+            self.assertEquals(actualResult, expectedResult)
+        
+        deferred.addCallback(gotResult)
+                    
+        return chainDeferred.addCallback(lambda _: deferred)
+    
+    def assertDeferredRaises(self, deferred, expectedException,
+	                              chainDeferred=None):
+        """Calls assertRaises on the Failure of the deferred and expectedException.
+        
+        chainDeferred can be used to pass in previous Deferred objects that
+        have tests being run on them.  This chaining of Deferred's in tests
+        is needed to insure that all Deferred's are cleaned up at the end of
+        a test.
+        """
+        
+        if chainDeferred is None:
+            chainDeferred = defer.succeed(None)
+
+        def gotFailure(f):
+            #f.printTraceback()
+            self.assertRaises(expectedException, f.raiseException)
+            #return f
+        
+        deferred.addBoth(gotFailure)
+            
+        return chainDeferred.addCallback(lambda _: deferred)
+
diff --git a/IPython/tools/__init__.py b/IPython/tools/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/tools/__init__.py
diff --git a/IPython/tools/growl.py b/IPython/tools/growl.py
new file mode 100644
index 0000000..cc4613c
--- /dev/null
+++ b/IPython/tools/growl.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+
+class IPythonGrowlError(Exception):
+    pass
+
+class Notifier(object):
+
+    def __init__(self, app_name):
+        try:
+            import Growl
+        except ImportError:
+            self.g_notifier = None
+        else:
+            self.g_notifier =  Growl.GrowlNotifier(app_name, ['kernel', 'core'])
+            self.g_notifier.register()
+
+    def _notify(self, title, msg):
+        if self.g_notifier is not None:
+            self.g_notifier.notify('kernel', title, msg)        
+
+    def notify(self, title, msg):
+        self._notify(title, msg)
+
+    def notify_deferred(self, r, msg):
+        title = "Deferred Result"
+        msg = msg + '\n' + repr(r)
+        self._notify(title, msg)
+        return r
+
+_notifier = None
+
+def notify(title, msg):
+    pass
+
+def notify_deferred(r, msg):
+    return r
+
+def start(app_name):
+    global _notifier, notify, notify_deferred
+    if _notifier is not None:
+        raise IPythonGrowlError("this process is already registered with Growl")
+    else:
+        _notifier = Notifier(app_name)
+        notify = _notifier.notify
+        notify_deferred = _notifier.notify_deferred
+
+
diff --git a/IPython/tools/tests/__init__.py b/IPython/tools/tests/__init__.py
new file mode 100644
index 0000000..f751f68
--- /dev/null
+++ b/IPython/tools/tests/__init__.py
@@ -0,0 +1,10 @@
+# encoding: utf-8
+__docformat__ = "restructuredtext en"
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2005  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#                           Benjamin Ragan-Kelley <benjaminrk@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
diff --git a/IPython/tools/tests/test_tools_utils.py b/IPython/tools/tests/test_tools_utils.py
new file mode 100755
index 0000000..9c1eda1
--- /dev/null
+++ b/IPython/tools/tests/test_tools_utils.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+"""Testing script for the tools.utils module.
+"""
+
+# Module imports
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+
+# If you have standalone doctests in a separate file, set their names in the
+# dt_files variable (as a single string  or a list thereof).  The mkPath call
+# forms an absolute path based on the current file, it is not needed if you
+# provide the full pahts.
+dt_files = fullPath(__file__,['tst_tools_utils_doctest.txt',
+                              'tst_tools_utils_doctest2.txt'])
+
+# If you have any modules whose docstrings should be scanned for embedded tests
+# as examples accorging to standard doctest practice, set them here (as a
+# single string or a list thereof):
+dt_modules = 'IPython.tools.utils'
+
+##########################################################################
+### Regular unittest test classes go here
+
+## class utilsTestCase(unittest.TestCase):
+##     def test_foo(self):
+##         pass
+        
+##########################################################################
+### Main
+# This ensures that the code will run either standalone as a script, or that it
+# can be picked up by Twisted's `trial` test wrapper to run all the tests.
+if tcommon.pexpect is not None:
+    if __name__ == '__main__':
+        unittest.main(testLoader=IPDocTestLoader(dt_files,dt_modules))
+    else:
+        testSuite = lambda : makeTestSuite(__name__,dt_files,dt_modules)
diff --git a/IPython/tools/tests/tst_tools_utils_doctest.py b/IPython/tools/tests/tst_tools_utils_doctest.py
new file mode 100644
index 0000000..9f22d8b
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest.py
@@ -0,0 +1,12 @@
+# Setup - all imports are done in tcommon
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+
+# Doctest code begins here
+from IPython.tools import utils
+
+for i in range(10):
+    print i,
+    print i+1
+
+print 'simple loop is over'
diff --git a/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt b/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt
new file mode 100644
index 0000000..929d9c2
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest.tpl.txt
@@ -0,0 +1,18 @@
+=========================================
+ Doctests for the ``tools.utils`` module
+=========================================
+
+The way doctest loads these, the entire document is applied as a single test
+rather than multiple individual ones, unfortunately.
+
+
+Auto-generated tests
+====================
+
+%run tst_tools_utils_doctest.py
+
+
+Manually generated tests
+========================
+
+These are one-off tests written by hand, copied from an interactive prompt.
diff --git a/IPython/tools/tests/tst_tools_utils_doctest.txt b/IPython/tools/tests/tst_tools_utils_doctest.txt
new file mode 100644
index 0000000..8301b98
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest.txt
@@ -0,0 +1,42 @@
+
+=========================
+ Auto-generated doctests
+=========================
+
+This file was auto-generated by IPython in its entirety.  If you need finer
+control over the contents, simply make a manual template.  See the
+mkdoctests.py script for details.
+
+
+----------------------------------------------------------------------------
+
+Begin included file tst_tools_utils_doctest.py::
+
+    # Setup - all imports are done in tcommon
+    >>> from IPython.testutils import tcommon
+    >>> from IPython.testutils.tcommon import *
+    
+    # Doctest code begins here
+    >>> from IPython.tools import utils
+    
+    >>> for i in range(10):
+    ...     print i,
+    ...     print i+1
+    ... 
+    0 1
+    1 2
+    2 3
+    3 4
+    4 5
+    5 6
+    6 7
+    7 8
+    8 9
+    9 10
+    >>> print 'simple loop is over'
+    simple loop is over
+    
+End included file tst_tools_utils_doctest.py
+
+----------------------------------------------------------------------------
+
diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.py b/IPython/tools/tests/tst_tools_utils_doctest2.py
new file mode 100644
index 0000000..8a35b98
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest2.py
@@ -0,0 +1,13 @@
+# Setup - all imports are done in tcommon
+from IPython.testutils import tcommon
+from IPython.testutils.tcommon import *
+
+# Doctest code begins here
+from IPython.tools import utils
+
+# Some other tests for utils
+
+utils.marquee('Testing marquee')
+
+utils.marquee('Another test',30,'.')
+
diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt b/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt
new file mode 100644
index 0000000..d09f4c4
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest2.tpl.txt
@@ -0,0 +1,18 @@
+=========================================
+ Doctests for the ``tools.utils`` module
+=========================================
+
+The way doctest loads these, the entire document is applied as a single test
+rather than multiple individual ones, unfortunately.
+
+
+Auto-generated tests
+====================
+
+%run tst_tools_utils_doctest2.py
+
+
+Manually generated tests
+========================
+
+These are one-off tests written by hand, copied from an interactive prompt.
diff --git a/IPython/tools/tests/tst_tools_utils_doctest2.txt b/IPython/tools/tests/tst_tools_utils_doctest2.txt
new file mode 100644
index 0000000..bebb551
--- /dev/null
+++ b/IPython/tools/tests/tst_tools_utils_doctest2.txt
@@ -0,0 +1,42 @@
+=========================================
+ Doctests for the ``tools.utils`` module
+=========================================
+
+The way doctest loads these, the entire document is applied as a single test
+rather than multiple individual ones, unfortunately.
+
+
+Auto-generated tests
+====================
+
+
+----------------------------------------------------------------------------
+
+Begin included file tst_tools_utils_doctest2.py::
+
+    # Setup - all imports are done in tcommon
+    >>> from IPython.testutils import tcommon
+    >>> from IPython.testutils.tcommon import *
+    
+    # Doctest code begins here
+    >>> from IPython.tools import utils
+    
+    # Some other tests for utils
+    
+    >>> utils.marquee('Testing marquee')
+    '****************************** Testing marquee ******************************'
+    
+    >>> utils.marquee('Another test',30,'.')
+    '........ Another test ........'
+    
+    
+End included file tst_tools_utils_doctest2.py
+
+----------------------------------------------------------------------------
+
+
+
+Manually generated tests
+========================
+
+These are one-off tests written by hand, copied from an interactive prompt.
diff --git a/IPython/tools/utils.py b/IPython/tools/utils.py
new file mode 100644
index 0000000..f34cf5a
--- /dev/null
+++ b/IPython/tools/utils.py
@@ -0,0 +1,128 @@
+# encoding: utf-8
+"""Generic utilities for use by IPython's various subsystems.
+"""
+
+__docformat__ = "restructuredtext en"
+
+#-------------------------------------------------------------------------------
+#       Copyright (C) 2006  Fernando Perez <fperez@colorado.edu>
+#                           Brian E Granger <ellisonbg@gmail.com>
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------
+# Stdlib imports
+#---------------------------------------------------------------------------
+
+import os
+import sys
+
+#---------------------------------------------------------------------------
+# Other IPython utilities
+#---------------------------------------------------------------------------
+
+
+#---------------------------------------------------------------------------
+# Normal code begins
+#---------------------------------------------------------------------------
+
+def extractVars(*names,**kw):
+    """Extract a set of variables by name from another frame.
+
+    :Parameters:
+      - `*names`: strings
+        One or more variable names which will be extracted from the caller's
+    frame.
+
+    :Keywords:
+      - `depth`: integer (0)
+        How many frames in the stack to walk when looking for your variables.
+
+
+    Examples:
+
+        In [2]: def func(x):
+           ...:     y = 1
+           ...:     print extractVars('x','y')
+           ...:
+
+        In [3]: func('hello')
+        {'y': 1, 'x': 'hello'}
+    """
+
+    depth = kw.get('depth',0)
+    
+    callerNS = sys._getframe(depth+1).f_locals
+    return dict((k,callerNS[k]) for k in names)
+    
+
+def extractVarsAbove(*names):
+    """Extract a set of variables by name from another frame.
+
+    Similar to extractVars(), but with a specified depth of 1, so that names
+    are exctracted exactly from above the caller.
+
+    This is simply a convenience function so that the very common case (for us)
+    of skipping exactly 1 frame doesn't have to construct a special dict for
+    keyword passing."""
+
+    callerNS = sys._getframe(2).f_locals
+    return dict((k,callerNS[k]) for k in names)
+
+def shexp(s):
+    """Expand $VARS and ~names in a string, like a shell
+
+    :Examples:
+    
+       In [2]: os.environ['FOO']='test'
+
+       In [3]: shexp('variable FOO is $FOO')
+       Out[3]: 'variable FOO is test'
+    """
+    return os.path.expandvars(os.path.expanduser(s))
+    
+
+def list_strings(arg):
+    """Always return a list of strings, given a string or list of strings
+    as input.
+
+    :Examples:
+
+        In [7]: list_strings('A single string')
+        Out[7]: ['A single string']
+
+        In [8]: list_strings(['A single string in a list'])
+        Out[8]: ['A single string in a list']
+
+        In [9]: list_strings(['A','list','of','strings'])
+        Out[9]: ['A', 'list', 'of', 'strings']
+    """
+
+    if isinstance(arg,basestring): return [arg]
+    else: return arg
+
+def marquee(txt='',width=78,mark='*'):
+    """Return the input string centered in a 'marquee'.
+
+    :Examples:
+
+        In [16]: marquee('A test',40)
+        Out[16]: '**************** A test ****************'
+
+        In [17]: marquee('A test',40,'-')
+        Out[17]: '---------------- A test ----------------'
+
+        In [18]: marquee('A test',40,' ')
+        Out[18]: '                 A test                 '
+
+    """
+    if not txt:
+        return (mark*width)[:width]
+    nmark = (width-len(txt)-2)/len(mark)/2
+    if nmark < 0: nmark =0
+    marks = mark*nmark
+    return '%s %s %s' % (marks,txt,marks)
+
+