Final cleanup of kernelmanager

* Separated cleanup of connection file and ipc files
* Removed periods

IPython/zmq/kernelmanager.py

@@ -709,6 +709,7 b' class KernelManager(Configurable):'
     
     def __del__(self):
         self.cleanup_connection_file()
+        self.cleanup_ipc_files()
     
     #--------------------------------------------------------------------------
     # Channel management methods:
@@ -805,7 +806,7 b' class KernelManager(Configurable):'
         return self._hb_channel
 
     #--------------------------------------------------------------------------
-    # Connection and ipc file management.
+    # Connection and ipc file management
     #--------------------------------------------------------------------------
     
     def cleanup_connection_file(self):
@@ -820,8 +821,6 b' class KernelManager(Configurable):'
                 os.remove(self.connection_file)
             except (IOError, OSError):
                 pass
-            
-            self.cleanup_ipc_files()
     
     def cleanup_ipc_files(self):
         """Cleanup ipc files if we wrote them."""
@@ -866,7 +865,7 b' class KernelManager(Configurable):'
         self._connection_file_written = True
 
     #--------------------------------------------------------------------------
-    # Kernel management.
+    # Kernel management
     #--------------------------------------------------------------------------
 
     def start_kernel(self, **kw):
@@ -949,6 +948,7 b' class KernelManager(Configurable):'
 
         if not restart:
             self.cleanup_connection_file()
+            self.cleanup_ipc_files()
         else:
             self.cleanup_ipc_files()
 

IPython/zmq/kernelmanagerabc.py

@@ -161,7 +161,7 b' class KernelManagerABC(object):'
         pass
 
     #--------------------------------------------------------------------------
-    # Channel management methods:
+    # Channel management methods
     #--------------------------------------------------------------------------
 
     @abc.abstractmethod
@@ -193,7 +193,7 b' class KernelManagerABC(object):'
         pass
 
     #--------------------------------------------------------------------------
-    # Kernel management.
+    # Kernel management
     #--------------------------------------------------------------------------
 
     @abc.abstractmethod
@@ -223,3 +223,4 b' class KernelManagerABC(object):'
     @abc.abstractproperty
     def is_alive(self):
         pass
+

IPython/zmq/tests/test_kernelmanager.py

@@ -1,4 +1,4 b''
-"""Tests for the notebook kernel and session manager."""
+"""Tests for the notebook kernel and session manager"""
 
 from subprocess import PIPE
 import time