PyColorize.py => utils/PyColorize.py and updated imports.

IPython/core/debugger.py

@@ -31,7 +31,7 b' 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

IPython/core/iplib.py

@@ -45,7 +45,8 b' 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

IPython/core/magic.py

@@ -47,7 +47,7 b' 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 *

IPython/core/oinspect.py

@@ -27,7 +27,7 b' 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

IPython/kernel/core/ultraTB.py

@@ -90,7 +90,7 b' 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

IPython/lib/demo.py

@@ -168,7 +168,7 b' 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']

IPython/ultraTB.py

@@ -90,7 +90,7 b' 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

IPython/utils/tests/test_imports.py

@@ -19,3 +19,5 b' def test_import_ipstruct():'
 def test_import_platutils():
     from IPython.utils import platutils
 
+def test_import_PyColorize():
+    from IPython.utils import PyColorize