refactor

Author: jph00

execnb/_modidx.py

@@ -22,6 +22,7 @@
                              'execnb.nbio.write_nb': ('nbio.html#write_nb', 'execnb/nbio.py')},
             'execnb.shell': { 'execnb.shell.CaptureShell': ('shell.html#captureshell', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.__init__': ('shell.html#captureshell.__init__', 'execnb/shell.py'),
+                              'execnb.shell.CaptureShell._run': ('shell.html#captureshell._run', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.cell': ('shell.html#captureshell.cell', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.complete': ('shell.html#captureshell.complete', 'execnb/shell.py'),
                               'execnb.shell.CaptureShell.enable_gui': ('shell.html#captureshell.enable_gui', 'execnb/shell.py'),

execnb/shell.py

@@ -63,32 +63,40 @@ def __init__(self, path:str|Path=None, mpl_format='retina', history=False, timeo
         if not IN_NOTEBOOK: InteractiveShell._instance = self
         if set_matplotlib_formats:
             self.enable_matplotlib("inline")
-            self.run_cell("from matplotlib_inline.backend_inline import set_matplotlib_formats")
-            self.run_cell(f"set_matplotlib_formats('{mpl_format}')")
+            self._run("from matplotlib_inline.backend_inline import set_matplotlib_formats")
+            self._run(f"set_matplotlib_formats('{mpl_format}')")
 
-    def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
-                 stdout=True, stderr=True, display=True, timeout:Optional[int]=None):
-        if not timeout: timeout = self.timeout
+    def _run(self, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
+                 stdout=True, stderr=True, display=True):
         # TODO what if there's a comment?
         semic = raw_cell.rstrip().endswith(';')
-        if timeout:
-            def handler(*args): raise TimeoutError()
-            signal.signal(signal.SIGALRM, handler)
-            signal.alarm(timeout)
         with capture_output(display=display, stdout=stdout, stderr=stderr) as c:
             result = super().run_cell(raw_cell, store_history, silent, shell_futures=shell_futures, cell_id=cell_id)
-        if timeout: signal.alarm(0)
         return AttrDict(result=result, stdout='' if semic else c.stdout, stderr=c.stderr,
                         display_objects=c.outputs, exception=result.error_in_exec, quiet=semic)
 
     def set_path(self, path):
         "Add `path` to python path, or `path.parent` if it's a file"
         path = Path(path)
         if path.is_file(): path = path.parent
-        self.run_cell(f"import sys; sys.path.insert(0, '{path.as_posix()}')")
+        self._run(f"import sys; sys.path.insert(0, '{path.as_posix()}')")
 
     def enable_gui(self, gui=None): pass
 
+# %% ../nbs/02_shell.ipynb
+@patch
+def run_cell(self:CaptureShell, raw_cell, store_history=False, silent=False, shell_futures=True, cell_id=None,
+             stdout=True, stderr=True, display=True, timeout=None):
+    if not timeout: timeout = self.timeout
+    if timeout:
+        def handler(*args): raise TimeoutError()
+        signal.signal(signal.SIGALRM, handler)
+        signal.alarm(timeout)
+    try: return self._run(raw_cell, store_history, silent, shell_futures, cell_id=cell_id,
+                          stdout=stdout, stderr=stderr, display=display)
+    finally:
+        if timeout: signal.alarm(0)
+
 # %% ../nbs/02_shell.ipynb
 def format_exc(e):
     "Format exception `e` as a string"