Avoid zombie shells - addresses #30

Calysto · Sep 7, 2014 · 1b1058d · 1b1058d
1 parent 753c936
commit 1b1058d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/jupyter_kernel/magics/help_magic.py b/jupyter_kernel/magics/help_magic.py
@@ -53,7 +53,7 @@ def get_help_on(self, info, level):
         if info['magic']:
 
             if info['magic']['name'] == 'help':
-                return self.get_help('line', 'help')
+                return self.get_help('line', 'help', level)
 
             minfo = info['magic']
             errmsg = "No such %s magic '%s'" % (minfo['type'], minfo['name'])

diff --git a/jupyter_kernel/magics/shell_magic.py b/jupyter_kernel/magics/shell_magic.py
@@ -5,7 +5,7 @@
 from jupyter_kernel import Magic
 import subprocess
 import os
-import signal
+import atexit
 import threading
 import time
 try:
@@ -86,6 +86,8 @@ def start_process(self):
 
         self.proc = subprocess.Popen(self.cmd, **kwargs)
 
+        atexit.register(self.proc.terminate)
+
         self._error_thread = threading.Thread(target=self._read_errors)
         self._error_queue = Queue.Queue()
         self._error_thread.setDaemon(True)
@@ -116,6 +118,9 @@ def get_help_on(self, info, level=0):
         else:
             return "Sorry, no help is available on '%s'." % expr
 
+    def __del__(self):
+        self.proc.terminate()
+
 
 def register_magics(kernel):
     kernel.register_magics(ShellMagic)