iplib.py => core/iplib.py and updated tests and imports.

IPython/Extensions/InterpreterExec.py

@@ -43,7 +43,7 b' def prefilter_shell(self,line,continuation):'
         return self._prefilter(line,continuation)
 
 # Rebind this to be the new IPython prefilter:
-from IPython.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 InteractiveShell.prefilter = prefilter_shell
 # Clean up the namespace.
 del InteractiveShell,prefilter_shell

IPython/Extensions/InterpreterPasteInput.py

@@ -85,7 +85,7 b' Authors'
 
 import re
 
-from IPython.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 
 PROMPT_RE = re.compile(r'(^[ \t]*>>> |^[ \t]*\.\.\. )')
 

IPython/Extensions/PhysicalQInput.py

@@ -52,7 +52,7 b' def prefilter_PQ(self,line,continuation):'
     imported."""
 
     from re import match
-    from IPython.iplib import InteractiveShell
+    from IPython.core.iplib import InteractiveShell
 
     # This regexp is what does the real work
     unit_split = match(r'\s*(\w+)\s*=\s*(-?\d*\.?\d*[eE]?-?\d*)\s+([a-zA-Z].*)',
@@ -74,7 +74,7 b' def prefilter_PQ(self,line,continuation):'
     return InteractiveShell._prefilter(self,line,continuation)
 
 # Rebind this to be the new IPython prefilter:
-from IPython.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 InteractiveShell.prefilter = prefilter_PQ
 
 # Clean up the namespace.

IPython/Magic.py

@@ -3309,7 +3309,7 b' Defaulting color scheme to \'NoColor\'"""'
 
         strip_from_start = map(re.compile,strip_re)
         
-        from IPython import iplib
+        from IPython.core import iplib
         lines = []
         print "Pasting code; enter '%s' alone on the line to stop." % sentinel
         while 1:

IPython/Shell.py

@@ -38,7 +38,7 b' from IPython import ultraTB'
 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.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 from IPython.ipmaker import make_IPython
 from IPython.ipstruct import Struct
 from IPython.testing import decorators as testdec

IPython/UserConfig/ipythonrc

@@ -593,8 +593,8 b' execfile'
 
 # execfile example-magic.py
 
-# Look at the examples in IPython/iplib.py for more details on how these magic
-# functions need to process their arguments.
+# Look at the examples in IPython/core/iplib.py for more details on how 
+# these magic functions need to process their arguments.
 
 #---------------------------------------------------------------------------
 # Section: aliases for system shell commands

IPython/core/tests/test_imports.py

@@ -25,5 +25,9 b' def test_import_hooks():'
 def test_import_ipapi():
     from IPython.core import ipapi
 
+def test_imort_iplib():
+    from IPython.core import iplib
+
+
 
 

IPython/core/tests/test_iplib.py

@@ -13,7 +13,7 b' import tempfile'
 import nose.tools as nt
 
 # our own packages
-from IPython import iplib
+from IPython.core import iplib
 from IPython.core import ipapi
 
 #-----------------------------------------------------------------------------

IPython/deathrow/GnuplotInteractive.py

@@ -140,7 +140,7 b' else:'
     print """*** Type `gphelp` for help on the Gnuplot integration features."""
 
     # Add the new magic functions to the class dict
-    from IPython.iplib import InteractiveShell
+    from IPython.core.iplib import InteractiveShell
     InteractiveShell.magic_gpc = magic_gpc
     InteractiveShell.magic_gp_set_default = magic_gp_set_default
 

IPython/deathrow/twshell.py

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

IPython/frontend/prefilterfrontend.py

@@ -80,7 +80,7 b' class PrefilterFrontEnd(LineFrontEndBase):'
         # on exceptions (https://bugs.launchpad.net/bugs/337105)
         # XXX: This is horrible: module-leve monkey patching -> side
         # effects.
-        from IPython import iplib
+        from IPython.core import iplib
         iplib.InteractiveShell.isthreaded = True
 
         LineFrontEndBase.__init__(self, *args, **kwargs)

IPython/frontend/tests/test_prefilterfrontend.py

@@ -84,7 +84,7 b' def isolate_ipython0(func):'
             ipython0.user_ns = user_ns
             ipython0.user_global_ns = global_ns
         # Undo the hack at creation of PrefilterFrontEnd
-        from IPython import iplib
+        from IPythoncore. import iplib
         iplib.InteractiveShell.isthreaded = False
         return out
 

IPython/gui/wx/ipshell_nonblocking.py

@@ -26,6 +26,7 b' from thread_ex import ThreadEx'
 try:
     import IPython
     from IPython.utils import genutils
+    from IPython.core import iplib
 except Exception,e:
     print "Error importing IPython (%s)" % str(e)
     raise Exception, e
@@ -177,7 +178,7 b' class NonBlockingIPShell(object):'
         self._IP.set_hook('shell_hook', self._shell)
         
         #we replace the ipython default input command caller by our method
-        IPython.iplib.raw_input_original = self._raw_input_original
+        iplib.raw_input_original = self._raw_input_original
         #we replace the ipython default exit command by our method
         self._IP.exit = ask_exit_handler
         #we replace the help command

IPython/ipmaker.py

@@ -49,7 +49,7 b' from IPython import Release'
 from IPython.ipstruct import Struct
 from IPython.OutputTrap import OutputTrap
 from IPython.config.configloader import ConfigLoader
-from IPython.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 from IPython.usage import cmd_line_usage,interactive_usage
 from IPython.utils.genutils import *
 

IPython/kernel/magic.py

@@ -17,7 +17,7 b' __docformat__ = "restructuredtext en"'
 
 import new
 
-from IPython.iplib import InteractiveShell
+from IPython.core.iplib import InteractiveShell
 from IPython.Shell import MTInteractiveShell
 
 from twisted.internet.defer import Deferred

IPython/kernel/scripts/ipcluster.py

@@ -39,7 +39,7 b' from IPython.kernel.fcutil import have_crypto'
 
 # Create various ipython directories if they don't exist.
 # This must be done before IPython.kernel.config is imported.
-from IPython.iplib import user_setup
+from IPython.core.iplib import user_setup
 if os.name == 'posix':
     rc_suffix = ''
 else:

IPython/kernel/scripts/ipcontroller.py

@@ -41,7 +41,7 b' from IPython.kernel.fcutil import check_furl_file_security'
 
 # Create various ipython directories if they don't exist.
 # This must be done before IPython.kernel.config is imported.
-from IPython.iplib import user_setup
+from IPython.core.iplib import user_setup
 from IPython.utils.genutils import get_ipython_dir, get_log_dir, get_security_dir
 if os.name == 'posix':
     rc_suffix = ''

IPython/kernel/scripts/ipengine.py

@@ -36,7 +36,7 b' from IPython.kernel.engineservice import EngineService'
 
 # Create various ipython directories if they don't exist.
 # This must be done before IPython.kernel.config is imported.
-from IPython.iplib import user_setup
+from IPython.core.iplib import user_setup
 from IPython.utils.genutils import get_ipython_dir, get_log_dir, get_security_dir
 if os.name == 'posix':
     rc_suffix = ''

IPython/testing/plugin/Makefile

@@ -40,7 +40,7 b' excolors: plugin'
 	$(NOSE) IPython.core.excolors
 
 iplib: plugin
-	$(NOSE)  IPython.iplib
+	$(NOSE)  IPython.core.iplib
 
 strd: plugin
 	$(NOSE) IPython.strdispatch

IPython/testing/plugin/ipdoctest.py

@@ -195,7 +195,7 b' def start_ipython():'
 
     # So that ipython magics and aliases can be doctested (they work by making
     # a call into a global _ip object)
-    _ip = IPython.ipapi.get()
+    _ip = ipapi.get()
     __builtin__._ip = _ip
 
     # Modify the IPython system call with one that uses getoutput, so that we

docs/source/development/reorg.txt

@@ -133,6 +133,9 b' Where things will be moved'
 
 * :file:`hooks.py`.  Move to :file:`IPython.core`.
 
+* :file:`ipapi.py`.  Move to :file:`IPython.core`.
+
+
 
 * :file:`Itpl.py`.  Remove.  Version already in :file:`IPython.external`.
 
@@ -176,7 +179,7 b' Where things will be moved'
 
 
 
-* :file:`ipapi.py`.  Move to :file:`IPython.core`.
+
 
 * :file:`iplib.py`.  Move to :file:`IPython.core`.