ipmaker.py => coore/ipmaker.py and imports updated.

IPython/Shell.py

@@ -39,7 +39,7 b' from IPython.core import ipapi'
 from IPython.Magic import Magic
 from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no
 from IPython.core.iplib import InteractiveShell
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.ipstruct import Struct
 from IPython.testing import decorators as testdec
 

IPython/core/tests/test_imports.py

@@ -28,6 +28,8 b' def test_import_ipapi():'
 def test_imort_iplib():
     from IPython.core import iplib
 
+def test_imort_ipmaker():
+    from IPython.core import ipmaker
 
 
 

IPython/deathrow/twshell.py

@@ -6,7 +6,7 b' import sys'
 
 from twisted.internet import reactor, threads
 
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.core.iplib import InteractiveShell 
 from IPython.ipstruct import Struct
 import Queue,thread,threading,signal

IPython/frontend/prefilterfrontend.py

@@ -27,7 +27,7 b' import os'
 import re
 import __builtin__
 
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.core.ipapi import IPApi
 from IPython.kernel.core.redirector_output_trap import RedirectorOutputTrap