Moving and renaming in preparation of subclassing InteractiveShell.

* IPython/scripts/ipython -> IPython/frontend/terminal/scripts
* IPython.core.ipapp -> IPython.frontend.terminal.ipapp
* IPython.core.embed -> IPython.frontend.terminal.embed
* IPython.core.iplib -> IPython.core.interactiveshell

IPython/__init__.py

@@ -40,10 +40,9 b' sys.path.append(os.path.join(os.path.dirname(__file__), "extensions"))'
 from .config.loader import Config
 from .core import release
 from .core.application import Application
-from .core.ipapp import IPythonApp
-from .core.embed import embed
+from .frontend.terminal.embed import embed
 from .core.error import TryNext
-from .core.iplib import InteractiveShell
+from .core.interactiveshell import InteractiveShell
 from .testing import test
 
 from .lib import (

IPython/core/alias.py

@@ -104,7 +104,7 b' class AliasManager(Configurable):'
 
     default_aliases = List(default_aliases(), config=True)
     user_aliases = List(default_value=[], config=True)
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     def __init__(self, shell=None, config=None):
         super(AliasManager, self).__init__(shell=shell, config=config)

IPython/core/builtin_trap.py

@@ -37,7 +37,7 b' BuiltinUndefined = __BuiltinUndefined()'
 
 class BuiltinTrap(Configurable):
 
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     def __init__(self, shell=None):
         super(BuiltinTrap, self).__init__(shell=shell, config=None)

IPython/core/debugger.py

@@ -184,7 +184,7 b' class Pdb(OldPdb):'
 
         if self.is_pydb:
 
-            # iplib.py's ipalias seems to want pdb's checkline
+            # interactiveshell.py's ipalias seems to want pdb's checkline
             # which located in pydb.fn
             import pydb.fns
             self.checkline = lambda filename, lineno: \

IPython/core/extensions.py

@@ -53,7 +53,7 b' class ExtensionManager(Configurable):'
     is added to ``sys.path`` automatically.
     """
 
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     def __init__(self, shell=None, config=None):
         super(ExtensionManager, self).__init__(shell=shell, config=config)

IPython/core/ipapi.py

@@ -25,6 +25,6 b' has been made into a component, this module will be sent to deathrow.'
 
 def get():
     """Get the global InteractiveShell instance."""
-    from IPython.core.iplib import InteractiveShell
+    from IPython.core.interactiveshell import InteractiveShell
     return InteractiveShell.instance()
 

IPython/core/magic.py

@@ -1699,7 +1699,7 b' Currently the magic system has the following functions:\\n"""'
         # set the __file__ global in the script's namespace
         prog_ns['__file__'] = filename
 
-        # pickle fix.  See iplib for an explanation.  But we need to make sure
+        # pickle fix.  See interactiveshell for an explanation.  But we need to make sure
         # that, if we overwrite __main__, we replace it at the end
         main_mod_name = prog_ns['__name__']
 
@@ -3327,10 +3327,10 b' Defaulting color scheme to \'NoColor\'"""'
     def _get_pasted_lines(self, sentinel):
         """ Yield pasted lines until the user enters the given sentinel value.
         """
-        from IPython.core import iplib
+        from IPython.core import interactiveshell
         print "Pasting code; enter '%s' alone on the line to stop." % sentinel
         while True:
-            l = iplib.raw_input_original(':')
+            l = interactiveshell.raw_input_original(':')
             if l == sentinel:
                 return
             else:

IPython/core/prefilter.py

@@ -210,7 +210,7 b' class PrefilterManager(Configurable):'
     """
 
     multi_line_specials = CBool(True, config=True)
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     def __init__(self, shell=None, config=None):
         super(PrefilterManager, self).__init__(shell=shell, config=config)
@@ -453,7 +453,7 b' class PrefilterTransformer(Configurable):'
     priority = Int(100, config=True)
     # Transformers don't currently use shell or prefilter_manager, but as we
     # move away from checkers and handlers, they will need them.
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager')
     enabled = Bool(True, config=True)
 
@@ -561,7 +561,7 b' class PrefilterChecker(Configurable):'
     """Inspect an input line and return a handler for that line."""
 
     priority = Int(100, config=True)
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager')
     enabled = Bool(True, config=True)
 
@@ -754,7 +754,7 b' class PrefilterHandler(Configurable):'
 
     handler_name = Str('normal')
     esc_strings = List([])
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager')
 
     def __init__(self, shell=None, prefilter_manager=None, config=None):

IPython/core/splitinput.py

@@ -30,7 +30,7 b' import re'
 # RegExp for splitting line contents into pre-char//first word-method//rest.
 # For clarity, each group in on one line.
 
-# WARNING: update the regexp if the escapes in iplib are changed, as they
+# WARNING: update the regexp if the escapes in interactiveshell are changed, as they
 # are hardwired in.
 
 # Although it's not solely driven by the regex, note that:

IPython/core/tests/test_imports.py

@@ -25,8 +25,8 b' def test_import_hooks():'
 def test_import_ipapi():
     from IPython.core import ipapi
 
-def test_import_iplib():
-    from IPython.core import iplib
+def test_import_interactiveshell():
+    from IPython.core import interactiveshell
 
 def test_import_logger():
     from IPython.core import logger

IPython/core/tests/test_iplib.py

@@ -1,4 +1,4 b''
-"""Tests for the key iplib module, where the main ipython class is defined.
+"""Tests for the key interactiveshell module, where the main ipython class is defined.
 """
 #-----------------------------------------------------------------------------
 # Module imports
@@ -60,7 +60,7 b' def test_reset():'
 
 
 # Tests for reporting of exceptions in various modes, handling of SystemExit,
-# and %tb functionality.  This is really a mix of testing ultraTB and iplib.
+# and %tb functionality.  This is really a mix of testing ultraTB and interactiveshell.
 
 def doctest_tb_plain():
     """

IPython/extensions/parallelmagic.py

@@ -36,7 +36,7 b' class ParalleMagic(Plugin):'
 
     active_multiengine_client = Any()
     verbose = Bool(False, config=True)
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     def __init__(self, shell=None, config=None):
         super(ParalleMagic, self).__init__(shell=shell, config=config)

IPython/extensions/pretty.py

@@ -55,7 +55,7 b' class PrettyResultDisplay(Plugin):'
     """A component for pretty printing on steroids."""
 
     verbose = Bool(False, config=True)
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
     # A list of (type, func_name), like
     # [(dict, 'my_dict_printer')]

IPython/extensions/tests/test_pretty.py

@@ -18,7 +18,7 b' Simple tests for :mod:`IPython.extensions.pretty`.'
 from unittest import TestCase
 
 from IPython.config.configurable import Configurable
-from IPython.core.iplib import InteractiveShellABC
+from IPython.core.interactiveshell import InteractiveShellABC
 from IPython.extensions import pretty as pretty_ext
 from IPython.external import pretty
 from IPython.testing import decorators as dec

IPython/frontend/terminal/embed.py

@@ -30,8 +30,8 b' import sys'
 from contextlib import nested
 
 from IPython.core import ultratb
-from IPython.core.iplib import InteractiveShell
-from IPython.core.ipapp import load_default_config
+from IPython.core.interactiveshell import InteractiveShell
+from IPython.frontend.terminal.ipapp import load_default_config
 
 from IPython.utils.traitlets import Bool, Str, CBool
 from IPython.utils.io import ask_yes_no

IPython/frontend/terminal/ipapp.py

@@ -31,14 +31,14 b' import sys'
 from IPython.core import release
 from IPython.core.crashhandler import CrashHandler
 from IPython.core.application import Application, BaseAppConfigLoader
-from IPython.core.iplib import InteractiveShell
+from IPython.core.interactiveshell import InteractiveShell
 from IPython.config.loader import (
     Config,
     PyFileConfigLoader
 )
 from IPython.lib import inputhook
 from IPython.utils.path import filefind, get_ipython_dir
-from . import usage
+from IPython.core import usage
 
 #-----------------------------------------------------------------------------
 # Globals, utilities and helpers

IPython/frontend/terminal/scripts/ipython

@@ -1,6 +1,6 b''
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from IPython.core.ipapp import launch_new_instance
+from IPython.frontend.terminal.ipapp import launch_new_instance
 
 launch_new_instance()

IPython/testing/globalipapp.py

@@ -115,7 +115,7 b' def start_ipython():'
     start_ipython.already_called = True
 
     # Ok,  first time we're called, go ahead
-    from IPython.core import iplib
+    from IPython.core import interactiveshell
     
     def xsys(cmd):
         """Execute a command and print its output.
@@ -136,7 +136,7 b' def start_ipython():'
     config = tools.default_config()
 
     # Create and initialize our test-friendly IPython instance.
-    shell = iplib.InteractiveShell.instance(
+    shell = interactiveshell.InteractiveShell.instance(
         config=config, 
         user_ns=ipnsdict(), user_global_ns={}
     )

IPython/testing/iptest.py

@@ -153,10 +153,6 b' def make_exclude():'
     ipjoin = lambda *paths: pjoin('IPython', *paths)
     
     exclusions = [ipjoin('external'),
-                  # Deprecated old Shell and iplib modules, skip to avoid
-                  # warnings
-                  ipjoin('Shell'),
-                  ipjoin('iplib'),
                   pjoin('IPython_doctest_plugin'),
                   ipjoin('quarantine'),
                   ipjoin('deathrow'),

IPython/testing/plugin/Makefile

@@ -8,7 +8,7 b' NOSE=nosetests -vvs --with-ipdoctest --doctest-tests --doctest-extension=txt \\'
 SRC=ipdoctest.py setup.py ../decorators.py
 
 # Default target for clean 'make'
-default: iplib
+default: interactiveshell
 
 # The actual plugin installation
 plugin: IPython_doctest_plugin.egg-info
@@ -39,8 +39,8 b' magic: plugin'
 excolors: plugin
 	$(NOSE) IPython.core.excolors
 
-iplib: plugin
-	$(NOSE)  IPython.core.iplib
+interactiveshell: plugin
+	$(NOSE)  IPython.core.interactiveshell
 
 strd: plugin
 	$(NOSE) IPython.core.strdispatch
@@ -61,7 +61,7 b' sr: rtest strd'
 
 base: dtest rtest test strd deco
 
-quick: base iplib ipipe
+quick: base interactiveshell ipipe
 
 all: base ipython
 

IPython/utils/process.py

@@ -77,7 +77,7 b' def find_cmd(cmd):'
     
         from IPython.utils.path import get_ipython_module_path
         from IPython.utils.process import pycmd2argv
-        argv = pycmd2argv(get_ipython_module_path('IPython.core.ipapp'))
+        argv = pycmd2argv(get_ipython_module_path('IPython.frontend.terminal.ipapp'))
 
     Parameters
     ----------

IPython/utils/tests/test_path.py

@@ -255,7 +255,7 b' def test_get_ipython_package_dir():'
 
 
 def test_get_ipython_module_path():
-    ipapp_path = path.get_ipython_module_path('IPython.core.ipapp')
+    ipapp_path = path.get_ipython_module_path('IPython.frontend.terminal.ipapp')
     nt.assert_true(os.path.isfile(ipapp_path))
 
 

IPython/zmq/ipkernel.py

@@ -27,7 +27,7 b' import zmq'
 
 # Local imports.
 from IPython.config.configurable import Configurable
-from IPython.core.iplib import InteractiveShell, InteractiveShellABC
+from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
 from IPython.external.argparse import ArgumentParser
 from IPython.utils.traitlets import Instance
 from IPython.zmq.session import Session, Message
@@ -42,7 +42,7 b' from exitpoller import ExitPollerUnix, ExitPollerWindows'
 
 class Kernel(Configurable):
 
-    shell = Instance('IPython.core.iplib.InteractiveShellABC')
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     session = Instance('IPython.zmq.session.Session')
     reply_socket = Instance('zmq.Socket')
     pub_socket = Instance('zmq.Socket')

ipython.py

@@ -13,4 +13,6 b' this_dir = os.path.dirname(os.path.abspath(__file__))'
 sys.path.insert(0, this_dir)
 
 # Now proceed with execution
-execfile(os.path.join(this_dir, 'IPython', 'scripts', 'ipython'))
+execfile(os.path.join(
+    this_dir, 'IPython', 'frontend', 'terminal', 'scripts', 'ipython'
+))

scripts/ipython_win_post_install.py

@@ -35,8 +35,6 b' def install():'
         'ipcontroller',
         'ipengine',
         'ipcluster',
-        'ipythonx',
-        'ipython-wx',
         'irunner'
     ]
     scripts = pjoin(prefix,'scripts')

setup.py

@@ -207,12 +207,11 b" if 'setuptools' in sys.modules:"
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': [
-            'ipython = IPython.core.ipapp:launch_new_instance',
+            'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
             'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
             'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
-            'ipythonx = IPython.frontend.wx.ipythonx:main',
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]

setupbase.py

@@ -111,6 +111,7 b' def find_packages():'
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
     add_package(packages, 'frontend.qt.console')
+    add_package(packages, 'frontend.terminal', config=False, tests=True, scripts=True)    
     add_package(packages, 'kernel', config=False, tests=True, scripts=True)
     add_package(packages, 'kernel.core', config=False, tests=True)
     add_package(packages, 'lib', tests=True)
@@ -254,12 +255,11 b' def find_scripts():'
     """
     kernel_scripts = pjoin('IPython','kernel','scripts')
     main_scripts = pjoin('IPython','scripts')
+    frontend_terminal_scripts = pjoin('IPython','frontend','terminal','scripts')
     scripts = [pjoin(kernel_scripts, 'ipengine'),
                pjoin(kernel_scripts, 'ipcontroller'),
                pjoin(kernel_scripts, 'ipcluster'),
-               pjoin(main_scripts, 'ipython'),
-               pjoin(main_scripts, 'ipythonx'),
-               pjoin(main_scripts, 'ipython-wx'),
+               pjoin(frontend_terminal_scripts, 'ipython'),
                pjoin(main_scripts, 'pycolor'),
                pjoin(main_scripts, 'irunner'),
                pjoin(main_scripts, 'iptest')