Index: ipython-0.10/IPython/CrashHandler.py

===================================================================

--- ipython-0.10.orig/IPython/CrashHandler.py

+++ ipython-0.10/IPython/CrashHandler.py

@@ -27,7 +27,7 @@ from pprint import pprint,pformat

 from IPython import Release

 from IPython import ultraTB

 from IPython.ColorANSI import ColorScheme,ColorSchemeTable  # too long names

-from IPython.Itpl import Itpl,itpl,printpl

+from IPython.external.Itpl import Itpl, itpl, printpl

 from IPython.genutils import *

Index: ipython-0.10/IPython/Extensions/ipy_editors.py

===================================================================

--- ipython-0.10.orig/IPython/Extensions/ipy_editors.py

+++ ipython-0.10/IPython/Extensions/ipy_editors.py

@@ -8,7 +8,7 @@ Contributions are *very* welcome.

 import IPython.ipapi

 ip = IPython.ipapi.get()

-from IPython.Itpl import itplns

+from IPython.external.Itpl import itplns

 import os

 def install_editor(run_template, wait = False):

Index: ipython-0.10/IPython/Extensions/ipy_profile_sh.py

===================================================================

--- ipython-0.10.orig/IPython/Extensions/ipy_profile_sh.py

+++ ipython-0.10/IPython/Extensions/ipy_profile_sh.py

@@ -173,7 +173,7 @@ def extend_shell_behavior(ip):

     # mark the IPSHELL with this signature

     ip.IP.user_ns['__builtins__'].__dict__['__sig__'] = ip.IP.__sig__

-    from IPython.Itpl import ItplNS

+    from IPython.external.Itpl import ItplNS

     from IPython.genutils import shell

     # utility to expand user variables via Itpl

     # xxx do something sensible with depth?

Index: ipython-0.10/IPython/Extensions/ipy_render.py

===================================================================

--- ipython-0.10.orig/IPython/Extensions/ipy_render.py

+++ ipython-0.10/IPython/Extensions/ipy_render.py

@@ -9,7 +9,7 @@ ip = IPython.ipapi.get()

 from string import Template

 import sys,os

-from IPython.Itpl import itplns

+from IPython.external.Itpl import itplns

 def toclip_w32(s):

     """ Places contents of s to clipboard

Index: ipython-0.10/IPython/genutils.py

===================================================================

--- ipython-0.10.orig/IPython/genutils.py

+++ ipython-0.10/IPython/genutils.py

@@ -46,7 +46,7 @@ else:

 # Other IPython utilities

 import IPython

-from IPython.Itpl import Itpl,itpl,printpl

+from IPython.external.Itpl import Itpl, itpl, printpl

 from IPython import DPyGetOpt, platutils

 from IPython.generics import result_display

 import IPython.ipapi

Index: ipython-0.10/IPython/iplib.py

===================================================================

--- ipython-0.10.orig/IPython/iplib.py

+++ ipython-0.10/IPython/iplib.py

@@ -55,7 +55,7 @@ from IPython import Debugger,OInspect,Py

 from IPython.ColorANSI import ColorScheme,ColorSchemeTable  # too long names

 from IPython.Extensions import pickleshare

 from IPython.FakeModule import FakeModule, init_fakemod_dict

-from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns

+from IPython.external.Itpl import Itpl, itpl, printpl, ItplNS, itplns

 from IPython.Logger import Logger

 from IPython.Magic import Magic

 from IPython.Prompts import CachedOutput

Index: ipython-0.10/IPython/Magic.py

===================================================================

--- ipython-0.10.orig/IPython/Magic.py

+++ ipython-0.10/IPython/Magic.py

@@ -45,7 +45,7 @@ except ImportError:

 import IPython

 from IPython import Debugger, OInspect, wildcard

 from IPython.FakeModule import FakeModule

-from IPython.Itpl import Itpl, itpl, printpl,itplns

+from IPython.external.Itpl import Itpl, itpl, printpl, itplns

 from IPython.PyColorize import Parser

 from IPython.ipstruct import Struct

 from IPython.macro import Macro

Index: ipython-0.10/IPython/OInspect.py

===================================================================

--- ipython-0.10.orig/IPython/OInspect.py

+++ ipython-0.10/IPython/OInspect.py

@@ -29,7 +29,7 @@ import types

 # IPython's own

 from IPython import PyColorize

 from IPython.genutils import page,indent,Term

-from IPython.Itpl import itpl

+from IPython.external.Itpl import itpl

 from IPython.wildcard import list_namespace

 from IPython.ColorANSI import *

Index: ipython-0.10/IPython/Itpl.py

===================================================================

--- ipython-0.10.orig/IPython/Itpl.py

+++ /dev/null

@@ -1,290 +0,0 @@

-# -*- 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 "Is this not $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)

-"""

-

-#*****************************************************************************

-#

-# 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()

-

-try:

-    itpl_encoding = sys.stdin.encoding or 'ascii'

-except AttributeError:

-    itpl_encoding = 'ascii'

-

-    

-

-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=itpl_encoding,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:

-                val = eval(chunk,glob,loc)

-                try:

-                    app(str(val))

-                except UnicodeEncodeError:

-                    app(unicode(val))

-                

-            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