From 01bb834dd614a068d2287a9ecdb53abecae6fb5a 2009-07-02 05:17:22
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 05:17:22
Subject: [PATCH] Moved Itpl.py to deathrow as we already have a copy in external.

---

diff --git a/IPython/Extensions/ipy_editors.py b/IPython/Extensions/ipy_editors.py
index 3833e8a..dc8f483 100644
--- a/IPython/Extensions/ipy_editors.py
+++ b/IPython/Extensions/ipy_editors.py
@@ -8,7 +8,7 @@ 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):
diff --git a/IPython/Extensions/ipy_profile_sh.py b/IPython/Extensions/ipy_profile_sh.py
index 22f40ca..a0ae5ab 100644
--- a/IPython/Extensions/ipy_profile_sh.py
+++ b/IPython/Extensions/ipy_profile_sh.py
@@ -173,8 +173,8 @@ 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: \
diff --git a/IPython/Extensions/ipy_render.py b/IPython/Extensions/ipy_render.py
index 238b12b..032d5ed 100644
--- a/IPython/Extensions/ipy_render.py
+++ b/IPython/Extensions/ipy_render.py
@@ -9,7 +9,7 @@ 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
diff --git a/IPython/Magic.py b/IPython/Magic.py
index e3eae05..ba2edc9 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -46,7 +46,7 @@ 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
diff --git a/IPython/OInspect.py b/IPython/OInspect.py
index deac72e..3fcbaab 100644
--- a/IPython/OInspect.py
+++ b/IPython/OInspect.py
@@ -29,7 +29,7 @@ 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 *
 
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index f91da42..ec399b8 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -26,7 +26,7 @@ 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 *
 
diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py
index 24e5876..af6d5fd 100644
--- a/IPython/core/iplib.py
+++ b/IPython/core/iplib.py
@@ -49,7 +49,7 @@ 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
diff --git a/IPython/Itpl.py b/IPython/deathrow/Itpl.py
similarity index 100%
rename from IPython/Itpl.py
rename to IPython/deathrow/Itpl.py
diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py
index 64ea52f..e320cbe 100644
--- a/IPython/utils/genutils.py
+++ b/IPython/utils/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 platutils
 from IPython.utils import DPyGetOpt
 from IPython.utils.generics import result_display