Rename KernelBase & Kernel to Kernel & IPythonKernel

IPython/kernel/inprocess/client.py

@@ -45,7 +45,7 b' class InProcessKernelClient(KernelClient):'
     stdin_channel_class = Type(InProcessStdInChannel)
     hb_channel_class = Type(InProcessHBChannel)
 
-    kernel = Instance('IPython.kernel.inprocess.ipkernel.Kernel')
+    kernel = Instance('IPython.kernel.inprocess.ipkernel.InProcessKernel')
 
     #--------------------------------------------------------------------------
     # Channel management methods

IPython/kernel/inprocess/ipkernel.py

@@ -10,7 +10,7 b' import sys'
 from IPython.core.interactiveshell import InteractiveShellABC
 from IPython.utils.jsonutil import json_clean
 from IPython.utils.traitlets import Any, Enum, Instance, List, Type
-from IPython.kernel.zmq.ipkernel import Kernel
+from IPython.kernel.zmq.ipkernel import IPythonKernel
 from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell
 
 from .socket import DummySocket
@@ -19,7 +19,7 b' from .socket import DummySocket'
 # Main kernel class
 #-----------------------------------------------------------------------------
 
-class InProcessKernel(Kernel):
+class InProcessKernel(IPythonKernel):
 
     #-------------------------------------------------------------------------
     # InProcessKernel interface

IPython/kernel/zmq/ipkernel.py

@@ -8,12 +8,13 b' from IPython.core import release'
 from IPython.utils.py3compat import builtin_mod, PY3
 from IPython.utils.tokenutil import token_at_cursor
 from IPython.utils.traitlets import Instance, Type, Any
+from IPython.utils.decorators import undoc
 
-from .kernelbase import KernelBase
+from .kernelbase import Kernel as KernelBase
 from .serialize import serialize_object, unpack_apply_message
 from .zmqshell import ZMQInteractiveShell
 
-class Kernel(KernelBase):
+class IPythonKernel(KernelBase):
     shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     shell_class = Type(ZMQInteractiveShell)
 
@@ -34,7 +35,7 b' class Kernel(KernelBase):'
     _sys_eval_input = Any()
 
     def __init__(self, **kwargs):
-        super(Kernel, self).__init__(**kwargs)
+        super(IPythonKernel, self).__init__(**kwargs)
 
         # Initialize the InteractiveShell subclass
         self.shell = self.shell_class.instance(parent=self,
@@ -70,13 +71,13 b' class Kernel(KernelBase):'
 
     def start(self):
         self.shell.exit_now = False
-        super(Kernel, self).start()
+        super(IPythonKernel, self).start()
 
     def set_parent(self, ident, parent):
         """Overridden from parent to tell the display hook and output streams
         about the parent message.
         """
-        super(Kernel, self).set_parent(ident, parent)
+        super(IPythonKernel, self).set_parent(ident, parent)
         self.shell.set_parent(parent)
 
     def _forward_input(self, allow_stdin=False):
@@ -288,3 +289,14 b' class Kernel(KernelBase):'
     def do_clear(self):
         self.shell.reset(False)
         return dict(status='ok')
+
+
+# This exists only for backwards compatibility - use IPythonKernel instead
+
+@undoc
+class Kernel(IPythonKernel):
+    def __init__(self, *args, **kwargs):
+        import warnings
+        warnings.warn('Kernel is a deprecated alias of IPython.kernel.zmq.ipkernel.IPythonKernel',
+                      DeprecationWarning)
+        super(Kernel, self).__init__(*args, **kwargs)
  No newline at end of file

IPython/kernel/zmq/kernelapp.py

@@ -33,7 +33,7 b' from IPython.kernel.connect import ConnectionFileMixin'
 
 # local imports
 from .heartbeat import Heartbeat
-from .ipkernel import Kernel
+from .ipkernel import IPythonKernel
 from .parentpoller import ParentPollerUnix, ParentPollerWindows
 from .session import (
     Session, session_flags, session_aliases, default_secure,
@@ -100,10 +100,10 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,'
     name='ipkernel'
     aliases = Dict(kernel_aliases)
     flags = Dict(kernel_flags)
-    classes = [Kernel, ZMQInteractiveShell, ProfileDir, Session]
+    classes = [IPythonKernel, ZMQInteractiveShell, ProfileDir, Session]
     # the kernel class, as an importstring
-    kernel_class = Type('IPython.kernel.zmq.ipkernel.Kernel', config=True,
-                        klass='IPython.kernel.zmq.kernelbase.KernelBase',
+    kernel_class = Type('IPython.kernel.zmq.ipkernel.IPythonKernel', config=True,
+                        klass='IPython.kernel.zmq.kernelbase.Kernel',
     help="""The Kernel subclass to be used.
     
     This should allow easy re-use of the IPKernelApp entry point

IPython/kernel/zmq/kernelbase.py

@@ -32,11 +32,7 b' from IPython.utils.traitlets import ('
 from .session import Session
 
 
-#-----------------------------------------------------------------------------
-# Main kernel class
-#-----------------------------------------------------------------------------
-
-class KernelBase(Configurable):
+class Kernel(Configurable):
 
     #---------------------------------------------------------------------------
     # Kernel interface
@@ -111,7 +107,7 b' class KernelBase(Configurable):'
 
 
     def __init__(self, **kwargs):
-        super(KernelBase, self).__init__(**kwargs)
+        super(Kernel, self).__init__(**kwargs)
 
         # Build dict of handlers for message types
         msg_types = [ 'execute_request', 'complete_request',

IPython/parallel/apps/ipengineapp.py

@@ -37,7 +37,7 b' from IPython.parallel.apps.baseapp import ('
     catch_config_error,
 )
 from IPython.kernel.zmq.log import EnginePUBHandler
-from IPython.kernel.zmq.ipkernel import Kernel
+from IPython.kernel.zmq.ipkernel import IPythonKernel as Kernel
 from IPython.kernel.zmq.kernelapp import IPKernelApp
 from IPython.kernel.zmq.session import (
     Session, session_aliases, session_flags

IPython/parallel/engine/engine.py

@@ -27,7 +27,7 b' from IPython.parallel.factory import RegistrationFactory'
 from IPython.parallel.util import disambiguate_url
 
 from IPython.kernel.zmq.session import Message
-from IPython.kernel.zmq.ipkernel import Kernel
+from IPython.kernel.zmq.ipkernel import IPythonKernel as Kernel
 from IPython.kernel.zmq.kernelapp import IPKernelApp
 
 class EngineFactory(RegistrationFactory):

docs/source/development/wrapperkernels.rst

@@ -13,7 +13,7 b' such as bash.'
 Required steps
 --------------
 
-Subclass :class:`IPython.kernel.zmq.kernelbase.KernelBase`, and implement the
+Subclass :class:`IPython.kernel.zmq.kernelbase.Kernel`, and implement the
 following methods and attributes:
 
 .. class:: MyKernel
@@ -45,7 +45,7 b' following methods and attributes:'
      
      Your method should return a dict containing the fields described in
      :ref:`execution_results`. To display output, it can send messages
-     using :meth:`~IPython.kernel.zmq.kernelbase.KernelBase.send_response`.
+     using :meth:`~IPython.kernel.zmq.kernelbase.Kernel.send_response`.
      See :doc:`messaging` for details of the different message types.
 
 To launch your kernel, add this at the end of your module::
@@ -59,9 +59,9 b' Example'
 
 ``echokernel.py`` will simply echo any input it's given to stdout::
 
-    from IPython.kernel.zmq.kernelbase import KernelBase
+    from IPython.kernel.zmq.kernelbase import Kernel
 
-    class EchoKernel(KernelBase):
+    class EchoKernel(Kernel):
         implementation = 'Echo'
         implementation_version = '1.0'
         language = 'no-op'