move kernelmanagerabc into IPython.kernel

minrk · minrk · commit 704b7e045240 · 2013-01-28T20:28:23.000-08:00
diff --git a/IPython/inprocess/kernelmanager.py b/IPython/inprocess/kernelmanager.py
@@ -15,7 +15,7 @@
 from IPython.config.configurable import Configurable
 from IPython.inprocess.socket import DummySocket
 from IPython.utils.traitlets import Any, Instance, Type
-from IPython.zmq.kernelmanagerabc import (
+from IPython.kernel import (
     ShellChannelABC, IOPubChannelABC,
     HBChannelABC, StdInChannelABC,
     KernelManagerABC
@@ -184,7 +184,7 @@ class InProcessKernelManager(Configurable):
     """A manager for an in-process kernel.
 
     This class implements the interface of
-    `IPython.zmq.kernelmanagerabc.KernelManagerABC` and allows
+    `IPython.kernel.kernelmanagerabc.KernelManagerABC` and allows
     (asynchronous) frontends to be used seamlessly with an in-process kernel.
     
     See `IPython.zmq.kernelmanager.KernelManager` for docstrings.
diff --git a/IPython/kernel/__init__.py b/IPython/kernel/__init__.py
@@ -1,3 +1,4 @@
-"""IPython kernel bases"""
+"""IPython kernel bases and utilities"""
 
+from .kernelmanagerabc import *
 from .util import *
diff --git a/IPython/kernel/kernelmanagerabc.py b/IPython/kernel/kernelmanagerabc.py
diff --git a/IPython/zmq/kernelmanager.py b/IPython/zmq/kernelmanager.py
@@ -46,7 +46,7 @@
     launch_kernel,
 )
 from session import Session
-from IPython.zmq.kernelmanagerabc import (
+from IPython.kernel import (
     ShellChannelABC, IOPubChannelABC,
     HBChannelABC, StdInChannelABC,
     KernelManagerABC

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`launch_kernel,`
`47`	`47`	`)`
`48`	`48`	`from session import Session`
`49`		`-from IPython.zmq.kernelmanagerabc import (`
	`49`	`+from IPython.kernel import (`
`50`	`50`	`ShellChannelABC, IOPubChannelABC,`
`51`	`51`	`HBChannelABC, StdInChannelABC,`
`52`	`52`	`KernelManagerABC`