ignore KeyboardInterrupt until we can handle it

alcidesv · Oct 12, 2011 · 026157b · 026157b
1 parent 9bb377b
commit 026157b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/IPython/frontend/zmqterminal/app.py b/IPython/frontend/zmqterminal/app.py
@@ -140,7 +140,6 @@ def init_shell(self):
                         ipython_dir=self.ipython_dir, kernel_manager=self.kernel_manager)
 
     def handle_sigint(self, *args):
-        # FIXME: this doesn't work, the kernel just dies every time
         self.shell.write('KeyboardInterrupt\n')
         self.kernel_manager.interrupt_kernel()
 

diff --git a/IPython/frontend/zmqterminal/interactiveshell.py b/IPython/frontend/zmqterminal/interactiveshell.py
@@ -185,7 +185,7 @@ def interact(self, display_banner=None):
 
         while not self.exit_now:
             if not self.km.is_alive:
-                ans = self.raw_input("kernel died, restart (y/n)?")
+                ans = self.raw_input("kernel died, restart ([y]/n)?")
                 if not ans.lower().startswith('n'):
                     self.km.restart_kernel(True)
                 else:

diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py
@@ -22,6 +22,9 @@
 import time
 import traceback
 import logging
+from signal import (
+        signal, default_int_handler, SIGINT, SIG_IGN
+)
 # System library imports.
 import zmq
 
@@ -161,6 +164,9 @@ def do_one_iteration(self):
     def start(self):
         """ Start the kernel main loop.
         """
+        # a KeyboardInterrupt (SIGINT) can occur on any python statement, so
+        # let's ignore (SIG_IGN) them until we're in a place to handle them properly
+        signal(SIGINT,SIG_IGN)
         poller = zmq.Poller()
         poller.register(self.shell_socket, zmq.POLLIN)
         while True:
@@ -173,10 +179,15 @@ def start(self):
                 # double nested try/except, to properly catch KeyboardInterrupt
                 # due to pyzmq Issue #130
                 try:
+                    # restore raising of KeyboardInterrupt
+                    signal(SIGINT, default_int_handler)
                     poller.poll(10*1000*self._poll_interval)
                     self.do_one_iteration()
                 except:
                     raise
+                finally:
+                    # prevent raising of KeyboardInterrupt
+                    signal(SIGINT,SIG_IGN)
             except KeyboardInterrupt:
                 # Ctrl-C shouldn't crash the kernel
                 io.raw_print("KeyboardInterrupt caught in kernel")