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

IPython/frontend/consoleapp.py

@@ -36,7 +36,7 b' from IPython.config.configurable import Configurable'
 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 (

IPython/frontend/html/notebook/notebookapp.py

@@ -70,7 +70,7 b' from IPython.zmq.ipkernel import ('
 )
 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

IPython/frontend/qt/console/qtconsoleapp.py

@@ -65,7 +65,7 b' from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget'
 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 (

IPython/kernel/__init__.py

@@ -1,10 +1,3 b''
-"""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 *

IPython/lib/kernel.py

@@ -1,12 +1,12 b''
 """[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 *
 

IPython/zmq/kernelapp.py

@@ -40,7 +40,7 b' from IPython.utils.traitlets import ('
     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

IPython/zmq/kernelmanager.py

@@ -40,7 +40,7 b' from IPython.utils.traitlets import ('
     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,

IPython/zmq/zmqshell.py

@@ -35,7 +35,7 b' from IPython.core.magics import MacroToEdit, CodeMagics'
 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