undo ft handling

Author: jph00

execnb/shell.py

@@ -129,12 +129,10 @@ def _out_nb(o, fmt):
     if o.stdout: res.append(_out_stream(o.stdout, 'stdout'))
     if o.stderr: res.append(_out_stream(o.stderr, 'stderr'))
     if o.exception: res.append(_out_exc(o.exception))
-    r = o.result.result
-    if hasattr(r, '__ft__'): r = r.__ft__()
-    res.result = r
+    res.result = o.result.result
     for x in o.display_objects: res.append(_mk_out(x.data, x.metadata))
-    if r is not None and not o.quiet and not isinstance_str(r, 'FT'):
-        res.append(_mk_out(*fmt.format(r), 'execute_result'))
+    if res.result is not None and not o.quiet:
+        res.append(_mk_out(*fmt.format(res.result), 'execute_result'))
     if 'execution_count' not in o: o['execution_count']=None
     for p in res:
         if p["output_type"]=="execute_result": p['execution_count'] = o['execution_count']

nbs/02_shell.ipynb

@@ -713,12 +713,10 @@
     "    if o.stdout: res.append(_out_stream(o.stdout, 'stdout'))\n",
     "    if o.stderr: res.append(_out_stream(o.stderr, 'stderr'))\n",
     "    if o.exception: res.append(_out_exc(o.exception))\n",
-    "    r = o.result.result\n",
-    "    if hasattr(r, '__ft__'): r = r.__ft__()\n",
-    "    res.result = r\n",
+    "    res.result = o.result.result\n",
     "    for x in o.display_objects: res.append(_mk_out(x.data, x.metadata))\n",
-    "    if r is not None and not o.quiet and not isinstance_str(r, 'FT'):\n",
-    "        res.append(_mk_out(*fmt.format(r), 'execute_result'))\n",
+    "    if res.result is not None and not o.quiet:\n",
+    "        res.append(_mk_out(*fmt.format(res.result), 'execute_result'))\n",
     "    if 'execution_count' not in o: o['execution_count']=None\n",
     "    for p in res:\n",
     "        if p[\"output_type\"]==\"execute_result\": p['execution_count'] = o['execution_count']\n",
@@ -791,8 +789,8 @@
       "text/plain": [
        "[{'name': 'stdout',\n",
        "  'output_type': 'stream',\n",
-       "  'text': ['CPU times: user 1 us, sys: 0 ns, total: 1 us\\n',\n",
-       "   'Wall time: 3.1 us\\n']},\n",
+       "  'text': ['CPU times: user 2 us, sys: 0 ns, total: 2 us\\n',\n",
+       "   'Wall time: 1.91 us\\n']},\n",
        " {'data': {'text/plain': ['2']},\n",
        "  'metadata': {},\n",
        "  'output_type': 'execute_result',\n",
@@ -936,7 +934,7 @@
      "text": [
       "\u001b[91m---------------------------------------------------------------------------\u001b[39m\n",
       "\u001b[91mNameError\u001b[39m                                 Traceback (most recent call last)\n",
-      "\u001b[96mCell\u001b[39m\u001b[96m \u001b[39m\u001b[32mIn[34]\u001b[39m\u001b[32m, line 1\u001b[39m\n",
+      "\u001b[96mCell\u001b[39m\u001b[96m \u001b[39m\u001b[32mIn[35]\u001b[39m\u001b[32m, line 1\u001b[39m\n",
       "\u001b[92m----> \u001b[39m\u001b[92m1\u001b[39m \u001b[38;5;81mtry\u001b[39m\u001b[38;5;15m:\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;15mf\u001b[39m\u001b[38;5;15m(\u001b[39m\u001b[38;5;15m)\u001b[39m\n",
       "\u001b[92m      2\u001b[39m \u001b[38;5;81mexcept\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;148mException\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;81mas\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;15me\u001b[39m\u001b[38;5;15m:\u001b[39m\n",
       "\u001b[92m      3\u001b[39m \u001b[38;5;15m    \u001b[39m\u001b[38;5;15mex\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;204m=\u001b[39m\u001b[38;5;15m \u001b[39m\u001b[38;5;15me\u001b[39m\n",
@@ -1119,7 +1117,11 @@
        "----> 1 import time; time.sleep(1.1)\n",
        "\n",
        "Cell In[6], line 7, in run_cell.<locals>.handler(*args)\n",
-       "----> 7 def handler(*args): raise TimeoutError()\n",
+       "      5 if not timeout: timeout = self.timeout\n",
+       "      6 if timeout:\n",
+       "----> 7     def handler(*args): raise TimeoutError()\n",
+       "      8     signal.signal(signal.SIGALRM, handler)\n",
+       "      9     signal.alarm(timeout)\n",
        "\n",
        "TimeoutError: \n",
        "</code></pre>\n"
@@ -1158,7 +1160,11 @@
        "<span class=\"ansi-green-fg\">----&gt; </span><span class=\"ansi-green-fg\">1</span> <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">import</span><span style=\"color: rgb(188,188,188)\"> </span><span class=\"ansi-blue-intense-fg ansi-bold\">time</span>; time.sleep(<span class=\"ansi-green-fg\">1.1</span>)\n",
        "\n",
        "<span class=\"ansi-cyan-fg\">Cell</span><span class=\"ansi-cyan-fg\"> </span><span class=\"ansi-green-fg\">In[6]</span><span class=\"ansi-green-fg\">, line 7</span>, in <span class=\"ansi-cyan-fg\">run_cell.&lt;locals&gt;.handler</span><span class=\"ansi-blue-fg\">(*args)</span>\n",
-       "<span class=\"ansi-green-fg\">----&gt; </span><span class=\"ansi-green-fg\">7</span> <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">def</span><span style=\"color: rgb(188,188,188)\"> </span><span class=\"ansi-blue-fg\">handler</span>(*args): <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">raise</span> <span class=\"ansi-bold\" style=\"color: rgb(215,95,95)\">TimeoutError</span>()\n",
+       "<span class=\"ansi-green-fg\">      5</span> <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">if</span> <span class=\"ansi-bold\" style=\"color: rgb(175,0,255)\">not</span> timeout: timeout = <span style=\"color: rgb(0,135,0)\">self</span>.timeout\n",
+       "<span class=\"ansi-green-fg\">      6</span> <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">if</span> timeout:\n",
+       "<span class=\"ansi-green-fg\">----&gt; </span><span class=\"ansi-green-fg\">7</span>     <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">def</span><span style=\"color: rgb(188,188,188)\"> </span><span class=\"ansi-blue-fg\">handler</span>(*args): <span class=\"ansi-bold\" style=\"color: rgb(0,135,0)\">raise</span> <span class=\"ansi-bold\" style=\"color: rgb(215,95,95)\">TimeoutError</span>()\n",
+       "<span class=\"ansi-green-fg\">      8</span>     signal.signal(signal.SIGALRM, handler)\n",
+       "<span class=\"ansi-green-fg\">      9</span>     signal.alarm(timeout)\n",
        "\n",
        "<span class=\"ansi-red-fg\">TimeoutError</span>: \n",
        "</code></pre>\n"
@@ -1837,11 +1843,11 @@
       "\n",
       "While Executing Cell #2:\n",
       "Traceback (most recent call last):\n",
-      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_26206/1421292703.py\", line 3, in <module>\n",
+      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_32164/1421292703.py\", line 3, in <module>\n",
       "    s.execute('../tests/error.ipynb', exc_stop=True)\n",
-      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_26206/3609882568.py\", line 18, in execute\n",
+      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_32164/3609882568.py\", line 18, in execute\n",
       "    self.run_all(nb, exc_stop=exc_stop, preproc=preproc, postproc=postproc,\n",
-      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_26206/3068237356.py\", line 19, in run_all\n",
+      "  File \"/var/folders/ss/34z569j921v58v8n1n_8z7h40000gn/T/ipykernel_32164/3068237356.py\", line 19, in run_all\n",
       "    if self.exc and exc_stop: raise self.exc from None\n",
       "                              ^^^^^^^^^^^^^^^^^^^^^^^^\n",
       "  File \"/Users/jhoward/uvws/.venv/lib/python3.12/site-packages/IPython/core/interactiveshell.py\", line 3549, in run_code\n",