Make KernelManager.kill_kernel private.

* kill_kernel -> _kill_kernel.
* Removed it from the ABC and implementations where approp.

IPython/frontend/html/notebook/kernelmanager.py

@@ -96,41 +96,25 b' class MultiKernelManager(LoggingConfigurable):'
         self._kernels[kernel_id] = km
         return kernel_id
 
-    def shutdown_kernel(self, kernel_id):
+    def shutdown_kernel(self, kernel_id, now=False):
         """Shutdown a kernel by its kernel uuid.
 
         Parameters
         ==========
         kernel_id : uuid
             The id of the kernel to shutdown.
+        now : bool
+            Should the kernel be shutdown forcibly using a signal.
         """
         k = self.get_kernel(kernel_id)
-        k.shutdown_kernel()
+        k.shutdown_kernel(now=now)
         k.shell_channel.stop()
         del self._kernels[kernel_id]
 
-    def shutdown_all(self):
+    def shutdown_all(self, now=False):
         """Shutdown all kernels."""
         for kid in self.list_kernel_ids():
-            self.shutdown_kernel(kid)
-
-    def kill_kernel(self, kernel_id):
-        """Kill a kernel by its kernel uuid.
-
-        Parameters
-        ==========
-        kernel_id : uuid
-            The id of the kernel to kill.
-        """
-        k = self.get_kernel(kernel_id)
-        k.kill_kernel()
-        k.shell_channel.stop()
-        del self._kernels[kernel_id]
-
-    def kill_all(self):
-        """Kill all kernels."""
-        for kid in self.list_kernel_ids():
-            self.kill_kernel(kid)
+            self.shutdown_kernel(kid, now=now)
 
     def interrupt_kernel(self, kernel_id):
         """Interrupt (SIGINT) the kernel by its uuid.
@@ -143,7 +127,7 b' class MultiKernelManager(LoggingConfigurable):'
         return self.get_kernel(kernel_id).interrupt_kernel()
 
     def signal_kernel(self, kernel_id, signum):
-        """ Sends a signal to the kernel by its uuid.
+        """Sends a signal to the kernel by its uuid.
 
         Note that since only SIGTERM is supported on Windows, this function
         is only useful on Unix systems.
@@ -330,20 +314,15 b' class MappingKernelManager(MultiKernelManager):'
             self.log.info("Using existing kernel: %s" % kernel_id)
         return kernel_id
 
-    def shutdown_kernel(self, kernel_id):
+    def shutdown_kernel(self, kernel_id, now=False):
         """Shutdown a kernel and remove its notebook association."""
         self._check_kernel_id(kernel_id)
-        super(MappingKernelManager, self).shutdown_kernel(kernel_id)
+        super(MappingKernelManager, self).shutdown_kernel(
+            kernel_id, now=now
+        )
         self.delete_mapping_for_kernel(kernel_id)
         self.log.info("Kernel shutdown: %s" % kernel_id)
 
-    def kill_kernel(self, kernel_id):
-        """Kill a kernel and remove its notebook association."""
-        self._check_kernel_id(kernel_id)
-        super(MappingKernelManager, self).kill_kernel(kernel_id)
-        self.delete_mapping_for_kernel(kernel_id)
-        self.log.info("Kernel killed: %s" % kernel_id)
-
     def interrupt_kernel(self, kernel_id):
         """Interrupt a kernel."""
         self._check_kernel_id(kernel_id)

IPython/inprocess/kernelmanager.py

@@ -277,7 +277,7 b' class InProcessKernelManager(Configurable):'
         self.kernel.frontends.append(self)
 
     def shutdown_kernel(self):
-        self.kill_kernel()
+        self._kill_kernel()
 
     def restart_kernel(self, now=False, **kwds):
         self.shutdown_kernel()
@@ -287,7 +287,7 b' class InProcessKernelManager(Configurable):'
     def has_kernel(self):
         return self.kernel is not None
 
-    def kill_kernel(self):
+    def _kill_kernel(self):
         self.kernel.frontends.remove(self)
         self.kernel = None
 

IPython/zmq/kernelmanager.py

@@ -923,7 +923,7 b' class KernelManager(Configurable):'
         """
         # FIXME: Shutdown does not work on Windows due to ZMQ errors!
         if sys.platform == 'win32':
-            self.kill_kernel()
+            self._kill_kernel()
             return
 
         # Pause the heart beat channel if it exists.
@@ -932,7 +932,7 b' class KernelManager(Configurable):'
 
         if now:
             if self.has_kernel:
-                self.kill_kernel()
+                self._kill_kernel()
         else:
             # Don't send any additional kernel kill messages immediately, to give
             # the kernel a chance to properly execute shutdown actions. Wait for at
@@ -946,7 +946,7 b' class KernelManager(Configurable):'
             else:
                 # OK, we've waited long enough.
                 if self.has_kernel:
-                    self.kill_kernel()
+                    self._kill_kernel()
 
         if not restart:
             self.cleanup_connection_file()
@@ -994,7 +994,7 b' class KernelManager(Configurable):'
         """Has a kernel been started that we are managing."""
         return self.kernel is not None
 
-    def kill_kernel(self):
+    def _kill_kernel(self):
         """Kill the running kernel.
 
         This is a private method, callers should use shutdown_kernel(now=True).

IPython/zmq/kernelmanagerabc.py

@@ -213,10 +213,6 b' class KernelManagerABC(object):'
         pass
 
     @abc.abstractmethod
-    def kill_kernel(self):
-        pass
-
-    @abc.abstractmethod
     def interrupt_kernel(self):
         pass