Moved Itpl.py to deathrow as we already have a copy in external.

IPython/Extensions/ipy_editors.py

@@ -8,7 +8,7 b' Contributions are *very* welcome.'
 from IPython.core import ipapi
 ip = ipapi.get()
 
-from IPython.Itpl import itplns
+from IPython.external.Itpl import itplns
 import os
 
 def install_editor(run_template, wait = False):

IPython/Extensions/ipy_profile_sh.py

@@ -173,8 +173,8 b' 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.genutils import shell
+    from IPython.external.Itpl import ItplNS
+    from IPython.utils.genutils import shell
     # utility to expand user variables via Itpl
     # xxx do something sensible with depth?
     ip.IP.var_expand = lambda cmd, lvars=None, depth=2: \

IPython/Extensions/ipy_render.py

@@ -9,7 +9,7 b' ip = 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

IPython/Magic.py

@@ -46,7 +46,7 b' import IPython'
 from IPython import OInspect, wildcard
 from IPython.core import debugger
 from IPython.core.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.utils.ipstruct import Struct
 from IPython.macro import Macro

IPython/OInspect.py

@@ -29,7 +29,7 b' import types'
 # IPython's own
 from IPython import PyColorize
 from IPython.utils.genutils import page,indent,Term
-from IPython.Itpl import itpl
+from IPython.external.Itpl import itpl
 from IPython.wildcard import list_namespace
 from IPython.utils.coloransi import *
 

IPython/core/crashhandler.py

@@ -26,7 +26,7 b' from pprint import pformat'
 # Our own
 from IPython import Release
 from IPython import ultraTB
-from IPython.Itpl import itpl
+from IPython.external.Itpl import itpl
 
 from IPython.utils.genutils import *
 

IPython/core/iplib.py

@@ -49,7 +49,7 b' from IPython import OInspect,PyColorize,ultraTB'
 from IPython.core import debugger
 from IPython.Extensions import pickleshare
 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
-from IPython.Itpl import ItplNS
+from IPython.external.Itpl import ItplNS
 from IPython.Logger import Logger
 from IPython.Magic import Magic
 from IPython.Prompts import CachedOutput

IPython/utils/genutils.py

@@ -46,7 +46,7 b' else:'
 
 # Other IPython utilities
 import IPython
-from IPython.Itpl import Itpl,itpl,printpl
+from IPython.external.Itpl import Itpl,itpl,printpl
 from IPython import platutils
 from IPython.utils import DPyGetOpt
 from IPython.utils.generics import result_display