From 432682cf1add744355afd4b0f1a59b81f3854cb6 2009-07-02 16:43:55
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 16:43:55
Subject: [PATCH] PyColorize.py => utils/PyColorize.py and updated imports.

---

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 4d3e158..e61e662 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -31,7 +31,7 @@ import linecache
 import os
 import sys
 
-from IPython import PyColorize
+from IPython.utils import PyColorize
 from IPython.core import ipapi
 from IPython.utils import coloransi
 from IPython.utils.genutils import Term
diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py
index dbd9b10..99c8175 100644
--- a/IPython/core/iplib.py
+++ b/IPython/core/iplib.py
@@ -45,7 +45,8 @@ import tempfile
 
 # IPython's own modules
 #import IPython
-from IPython import PyColorize,ultraTB
+from IPython import ultraTB
+from IPython.utils import PyColorize
 from IPython.core import debugger, oinspect
 from IPython.Extensions import pickleshare
 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index ddc5d16..eff1cd2 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -47,7 +47,7 @@ from IPython import wildcard
 from IPython.core import debugger, oinspect
 from IPython.core.fakemodule import FakeModule
 from IPython.external.Itpl import Itpl, itpl, printpl,itplns
-from IPython.PyColorize import Parser
+from IPython.utils.PyColorize import Parser
 from IPython.utils.ipstruct import Struct
 from IPython.core.macro import Macro
 from IPython.utils.genutils import *
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 3fcbaab..a134aac 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -27,7 +27,7 @@ import sys
 import types
 
 # IPython's own
-from IPython import PyColorize
+from IPython.utils import PyColorize
 from IPython.utils.genutils import page,indent,Term
 from IPython.external.Itpl import itpl
 from IPython.wildcard import list_namespace
diff --git a/IPython/kernel/core/ultraTB.py b/IPython/kernel/core/ultraTB.py
index 7f4354b..268e2aa 100644
--- a/IPython/kernel/core/ultraTB.py
+++ b/IPython/kernel/core/ultraTB.py
@@ -90,7 +90,7 @@ from inspect import getsourcefile, getfile, getmodule,\
 
 # IPython's own modules
 # Modified pdb which doesn't damage IPython's readline handling
-from IPython import PyColorize
+from IPython.utils import PyColorize
 from IPython.core import debugger
 from IPython.utils.ipstruct import Struct
 from IPython.core.excolors import exception_colors
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 632b93c..69d17b0 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -168,7 +168,7 @@ import re
 import shlex
 import sys
 
-from IPython.PyColorize import Parser
+from IPython.utils.PyColorize import Parser
 from IPython.utils.genutils import marquee, file_read, file_readlines
 
 __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError']
diff --git a/IPython/ultraTB.py b/IPython/ultraTB.py
index 0b4316b..6184f71 100644
--- a/IPython/ultraTB.py
+++ b/IPython/ultraTB.py
@@ -90,7 +90,7 @@ from inspect import getsourcefile, getfile, getmodule,\
 
 # IPython's own modules
 # Modified pdb which doesn't damage IPython's readline handling
-from IPython import PyColorize
+from IPython.utils import PyColorize
 from IPython.core import debugger
 from IPython.utils.ipstruct import Struct
 from IPython.core.excolors import exception_colors
diff --git a/IPython/PyColorize.py b/IPython/utils/PyColorize.py
similarity index 100%
rename from IPython/PyColorize.py
rename to IPython/utils/PyColorize.py
diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py
index 4e58704..30e7773 100644
--- a/IPython/utils/tests/test_imports.py
+++ b/IPython/utils/tests/test_imports.py
@@ -19,3 +19,5 @@ def test_import_ipstruct():
 def test_import_platutils():
     from IPython.utils import platutils
 
+def test_import_PyColorize():
+    from IPython.utils import PyColorize