fix-time-magic-interrupt-handling

Author: Darshan808

IPython/core/magics/execution.py

@@ -20,6 +20,7 @@
 import sys
 import time
 import timeit
+import signal
 from typing import Dict, Any
 from ast import (
     Assign,
@@ -1257,6 +1258,13 @@ def timeit(self, line='', cell=None, local_ns=None):
         if return_result:
             return timeit_result
 
+    @magic_arguments.magic_arguments()
+    @magic_arguments.argument(
+        "--no-raise-error",
+        action="store_true",
+        dest="no_raise_error",
+        help="If given, don't re-raise exceptions",
+    )
     @skip_doctest
     @no_var_expand
     @needs_local_scope
@@ -1329,10 +1337,7 @@ def time(self, line="", cell=None, local_ns=None):
                 Wall time: 0.00 s
                 Compiler : 0.78 s
         """
-        # fail immediately if the given expression can't be compiled
-
-        if line and cell:
-            raise UsageError("Can't use statement directly after '%%time'!")
+        args = magic_arguments.parse_argstring(self.time, line)
 
         if cell:
             expr = self.shell.transform_cell(cell)
@@ -1376,13 +1381,21 @@ def time(self, line="", cell=None, local_ns=None):
         wtime = time.time
         # time execution
         wall_st = wtime()
+        # Track whether to propagate exceptions or exit
+        exit_on_interrupt = False
+        interrupt_occured = False
+
         if mode == "eval":
             st = clock2()
             try:
                 out = eval(code, glob, local_ns)
+            except KeyboardInterrupt:
+                interrupt_occured = True
+                exit_on_interrupt = True
             except Exception:
-                self.shell.showtraceback()
-                return
+                interrupt_occured = True
+                if not args.no_raise_error:
+                    exit_on_interrupt = True
             end = clock2()
         else:
             st = clock2()
@@ -1393,11 +1406,14 @@ def time(self, line="", cell=None, local_ns=None):
                 if expr_val is not None:
                     code_2 = self.shell.compile(expr_val, source, 'eval')
                     out = eval(code_2, glob, local_ns)
+            except KeyboardInterrupt:
+                interrupt_occured = True
+                exit_on_interrupt = True
             except Exception:
-                self.shell.showtraceback()
-                return
+                interrupt_occured = True
+                if not args.no_raise_error:
+                    exit_on_interrupt = True
             end = clock2()
-
         wall_end = wtime()
         # Compute actual times and report
         wall_time = wall_end - wall_st
@@ -1416,6 +1432,11 @@ def time(self, line="", cell=None, local_ns=None):
             print(f"Compiler : {_format_time(tc)}")
         if tp > tp_min:
             print(f"Parser   : {_format_time(tp)}")
+        if interrupt_occured:
+            if exit_on_interrupt:
+                self.shell.showtraceback()
+                sys.exit(signal.SIGINT)
+            return
         return out
 
     @skip_doctest
@@ -1514,7 +1535,7 @@ def macro(self, parameter_s=''):
         default="",
         nargs="?",
         help="""
-        
+
         The name of the variable in which to store output.
         This is a ``utils.io.CapturedIO`` object with stdout/err attributes
         for the text of the captured output.