update imports with new layout

IPython/frontend/consoleapp.py

@@ -34,8 +34,8 b' import uuid'
 from IPython.config.application import boolean_flag
 from IPython.config.configurable import Configurable
 from IPython.core.profiledir import ProfileDir
-from IPython.kernel.blockingkernelmanager import BlockingKernelManager
-from IPython.kernel.kernelmanager import KernelManager
+from IPython.kernel.blocking import BlockingKernelManager
+from IPython.kernel import KernelManager
 from IPython.kernel import tunnel_to_kernel, find_connection_file, swallow_argv
 from IPython.utils.path import filefind
 from IPython.utils.py3compat import str_to_bytes

IPython/kernel/__init__.py

@@ -5,6 +5,6 b' from . import zmq'
 
 from .connect import *
 from .launcher import *
-from .kernelmanager import KernelManager
-from .blockingkernelmanager import BlockingKernelManager
+from .manager import KernelManager
+from .blocking import BlockingKernelManager
 from .multikernelmanager import MultiKernelManager

IPython/kernel/blocking/__init__.py

@@ -0,0 +1,1 b''
+from .manager import BlockingKernelManager
  No newline at end of file

IPython/kernel/blocking/manager.py

@@ -16,7 +16,7 b' Useful for test suites and blocking terminal interfaces.'
 import Queue
 
 from IPython.utils.traitlets import Type
-from .kernelmanager import KernelManager, IOPubChannel, HBChannel, \
+from IPython.kernel.manager import KernelManager, IOPubChannel, HBChannel, \
     ShellChannel, StdInChannel
 
 #-----------------------------------------------------------------------------

IPython/kernel/ioloop/__init__.py

@@ -0,0 +1,2 b''
+from .manager import IOLoopKernelManager
+from .restarter import IOLoopKernelRestarter

IPython/kernel/ioloop/manager.py

@@ -20,8 +20,8 b' from IPython.utils.traitlets import ('
     Instance
 )
 
-from .blockingkernelmanager import BlockingKernelManager
-from .ioloopkernelrestarter import IOLoopKernelRestarter
+from IPython.kernel.blocking.manager import BlockingKernelManager
+from .restarter import IOLoopKernelRestarter
 
 #-----------------------------------------------------------------------------
 # Code
@@ -33,7 +33,7 b' class IOLoopKernelManager(BlockingKernelManager):'
     def _loop_default(self):
         return ioloop.IOLoop.instance()
 
-    _restarter = Instance('IPython.kernel.ioloopkernelrestarter.IOLoopKernelRestarter')
+    _restarter = Instance('IPython.kernel.ioloop.IOLoopKernelRestarter')
 
     def start_restarter(self):
         if self.autorestart and self.has_kernel:

IPython/kernel/ioloop/restarter.py

@@ -37,7 +37,7 b' class IOLoopKernelRestarter(LoggingConfigurable):'
     def _loop_default(self):
         return ioloop.IOLoop.instance()
 
-    kernel_manager = Instance('IPython.kernel.kernelmanager.KernelManager')
+    kernel_manager = Instance('IPython.kernel.KernelManager')
 
     time_to_dead = Float(3.0, config=True,
         help="""Kernel heartbeat interval in seconds."""

IPython/kernel/manager.py

@@ -48,7 +48,7 b' from IPython.kernel import ('
     launch_kernel,
 )
 from .zmq.session import Session
-from .kernelmanagerabc import (
+from .managerabc import (
     ShellChannelABC, IOPubChannelABC,
     HBChannelABC, StdInChannelABC,
     KernelManagerABC

IPython/kernel/multikernelmanager.py

@@ -42,7 +42,7 b' class MultiKernelManager(LoggingConfigurable):'
     """A class for managing multiple kernels."""
     
     kernel_manager_class = DottedObjectName(
-        "IPython.kernel.ioloopkernelmanager.IOLoopKernelManager", config=True,
+        "IPython.kernel.ioloop.IOLoopKernelManager", config=True,
         help="""The kernel manager class.  This is configurable to allow
         subclassing of the KernelManager for customized behavior.
         """

IPython/kernel/tests/test_kernelmanager.py

@@ -7,7 +7,7 b' from unittest import TestCase'
 from IPython.testing import decorators as dec
 
 from IPython.config.loader import Config
-from IPython.kernel.kernelmanager import KernelManager
+from IPython.kernel import KernelManager
 
 class TestKernelManager(TestCase):
 

IPython/kernel/tests/test_message_spec.py

@@ -15,7 +15,7 b' from Queue import Empty'
 
 import nose.tools as nt
 
-from ..blockingkernelmanager import BlockingKernelManager
+from IPython.kernel.blocking import BlockingKernelManager
 
 
 from IPython.testing import decorators as dec

IPython/kernel/tests/test_multikernelmanager.py

@@ -8,7 +8,7 b' from IPython.testing import decorators as dec'
 
 from IPython.config.loader import Config
 from IPython.utils.localinterfaces import LOCALHOST
-from IPython.kernel.kernelmanager import KernelManager
+from IPython.kernel import KernelManager
 from IPython.kernel.multikernelmanager import MultiKernelManager
 
 class TestKernelManager(TestCase):

IPython/kernel/zmq/tests/test_embed_kernel.py

@@ -22,7 +22,7 b' from subprocess import Popen, PIPE'
 
 import nose.tools as nt
 
-from IPython.kernel.blockingkernelmanager import BlockingKernelManager
+from IPython.kernel.blocking import BlockingKernelManager
 from IPython.utils import path, py3compat
 
 #-------------------------------------------------------------------------------