move utils.kernel (formerly entry_point and lib.kernel) to kernel.util

minrk · minrk · commit 980674db5a44 · 2013-01-28T20:23:16.000-08:00
diff --git a/IPython/frontend/consoleapp.py b/IPython/frontend/consoleapp.py
@@ -36,7 +36,7 @@
 from IPython.core.profiledir import ProfileDir
 from IPython.zmq.blockingkernelmanager import BlockingKernelManager
 from IPython.zmq.kernelmanager import KernelManager
-from IPython.utils.kernel import tunnel_to_kernel, find_connection_file, swallow_argv
+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
 from IPython.utils.traitlets import (
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
@@ -70,7 +70,7 @@
 )
 from IPython.utils.importstring import import_item
 from IPython.utils.localinterfaces import LOCALHOST
-from IPython.utils.kernel import swallow_argv
+from IPython.kernel import swallow_argv
 from IPython.utils.traitlets import (
     Dict, Unicode, Integer, List, Enum, Bool,
     DottedObjectName
diff --git a/IPython/frontend/qt/console/qtconsoleapp.py b/IPython/frontend/qt/console/qtconsoleapp.py
@@ -65,7 +65,7 @@ def gui_excepthook(exctype, value, tb):
 from IPython.frontend.qt.console import styles
 from IPython.frontend.qt.console.mainwindow import MainWindow
 from IPython.frontend.qt.kernelmanager import QtKernelManager
-from IPython.utils.kernel import tunnel_to_kernel, find_connection_file
+from IPython.kernel import tunnel_to_kernel, find_connection_file
 from IPython.utils.path import filefind
 from IPython.utils.py3compat import str_to_bytes
 from IPython.utils.traitlets import (
diff --git a/IPython/kernel/__init__.py b/IPython/kernel/__init__.py
@@ -1,10 +1,3 @@
-"""IPython.kernel has been replaced by IPython.parallel.
+"""IPython kernel bases"""
 
-The previous version of IPython's parallel library was located at this
-location (IPython.kernel). It has been moved to the IPython.parallel
-subpackage and has been refactored to use zeromq/pyzmq instead of twisted.
-
-Please see INSERT URL for further details.
-"""
-
-raise ImportError(__doc__)
+from .util import *
diff --git a/IPython/kernel/tests/test_util.py b/IPython/kernel/tests/test_util.py
diff --git a/IPython/kernel/util.py b/IPython/kernel/util.py
diff --git a/IPython/lib/kernel.py b/IPython/lib/kernel.py
@@ -1,12 +1,12 @@
 """[DEPRECATED] Utilities for connecting to kernels
 
-Moved to IPython.utils.kernel, where it always belonged.
+Moved to IPython.kernel.util
 """
 
 import warnings
-warnings.warn("IPython.lib.kernel moved to IPython.utils.kernel in IPython 0.14",
+warnings.warn("IPython.lib.kernel moved to IPython.kernel in IPython 0.14",
     DeprecationWarning
 )
 
-from IPython.utils.kernel import *
+from IPython.kernel.util import *
 
diff --git a/IPython/zmq/kernelapp.py b/IPython/zmq/kernelapp.py
@@ -40,7 +40,7 @@
     DottedObjectName,
 )
 from IPython.utils.importstring import import_item
-from IPython.utils.kernel import write_connection_file
+from IPython.kernel import write_connection_file
 # local imports
 from IPython.zmq.heartbeat import Heartbeat
 from IPython.zmq.parentpoller import ParentPollerUnix, ParentPollerWindows
diff --git a/IPython/zmq/kernelmanager.py b/IPython/zmq/kernelmanager.py
@@ -40,7 +40,7 @@
     Any, Instance, Type, Unicode, List, Integer, Bool, CaselessStrEnum
 )
 from IPython.utils.py3compat import str_to_bytes
-from IPython.utils.kernel import (
+from IPython.kernel import (
     write_connection_file,
     make_ipkernel_cmd,
     launch_kernel,
diff --git a/IPython/zmq/zmqshell.py b/IPython/zmq/zmqshell.py
@@ -35,7 +35,7 @@
 from IPython.core.magic import magics_class, line_magic, Magics
 from IPython.core.payloadpage import install_payload_page
 from IPython.inprocess.socket import SocketABC
-from IPython.utils.kernel import (
+from IPython.kernel import (
     get_connection_file, get_connection_info, connect_qtconsole
 )
 from IPython.testing.skipdoctest import skip_doctest

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`)`
`71`	`71`	`from IPython.utils.importstring import import_item`
`72`	`72`	`from IPython.utils.localinterfaces import LOCALHOST`
`73`		`-from IPython.utils.kernel import swallow_argv`
	`73`	`+from IPython.kernel import swallow_argv`
`74`	`74`	`from IPython.utils.traitlets import (`
`75`	`75`	`Dict, Unicode, Integer, List, Enum, Bool,`
`76`	`76`	`DottedObjectName`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`DottedObjectName,`
`41`	`41`	`)`
`42`	`42`	`from IPython.utils.importstring import import_item`
`43`		`-from IPython.utils.kernel import write_connection_file`
	`43`	`+from IPython.kernel import write_connection_file`
`44`	`44`	`# local imports`
`45`	`45`	`from IPython.zmq.heartbeat import Heartbeat`
`46`	`46`	`from IPython.zmq.parentpoller import ParentPollerUnix, ParentPollerWindows`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`from IPython.core.magic import magics_class, line_magic, Magics`
`36`	`36`	`from IPython.core.payloadpage import install_payload_page`
`37`	`37`	`from IPython.inprocess.socket import SocketABC`
`38`		`-from IPython.utils.kernel import (`
	`38`	`+from IPython.kernel import (`
`39`	`39`	`get_connection_file, get_connection_info, connect_qtconsole`
`40`	`40`	`)`
`41`	`41`	`from IPython.testing.skipdoctest import skip_doctest`