Fix variable naming conflicts causing changed test behavior

Author: Isaac-Flath

nbs/02_shell.ipynb

@@ -779,8 +779,8 @@
       "text/plain": [
        "[{'name': 'stdout',\n",
        "  'output_type': 'stream',\n",
-       "  'text': ['CPU times: user 1e+03 ns, sys: 0 ns, total: 1e+03 ns\\n',\n",
-       "   'Wall time: 2.15 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",
@@ -998,8 +998,8 @@
     }
    ],
    "source": [
-    "o = s.run('from IPython.display import Markdown,display; print(0); print(1); display(Markdown(\"*2*\")); Markdown(\"*1*\")')\n",
-    "o"
+    "o1 = s.run('from IPython.display import Markdown,display; print(0); print(1); display(Markdown(\"*2*\")); Markdown(\"*1*\")')\n",
+    "o1"
    ]
   },
   {
@@ -1091,12 +1091,20 @@
     {
      "data": {
       "text/html": [
-       "<pre ><code class=''>0\n",
-       "1\n",
-       "</code></pre>\n",
-       "<p><em>2</em></p>\n",
+       "<pre ><code class=''>---------------------------------------------------------------------------\n",
+       "TimeoutError                              Traceback (most recent call last)\n",
+       "File &lt;ipython-input-1-a5c3817716b6&gt;:1\n",
+       "----&gt; 1 import time; time.sleep(1.1)\n",
+       "\n",
+       "Cell In[6], line 7, in run_cell.&lt;locals&gt;.handler(*args)\n",
+       "      5 if not timeout: timeout = self.timeout\n",
+       "      6 if timeout:\n",
+       "----&gt; 7     def handler(*args): raise TimeoutError()\n",
+       "      8     signal.signal(signal.SIGALRM, handler)\n",
+       "      9     signal.alarm(timeout)\n",
        "\n",
-       "<p><em>1</em></p>\n"
+       "TimeoutError: \n",
+       "</code></pre>\n"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"
@@ -1126,12 +1134,20 @@
     {
      "data": {
       "text/html": [
-       "<pre ><code class=''>0\n",
-       "1\n",
-       "</code></pre>\n",
-       "<p><em>2</em></p>\n",
+       "<pre ><code class='nohighlight hljs'><span class=\"ansi-red-fg\">---------------------------------------------------------------------------</span>\n",
+       "<span class=\"ansi-red-fg\">TimeoutError</span>                              Traceback (most recent call last)\n",
+       "<span class=\"ansi-cyan-fg\">File </span><span class=\"ansi-green-fg\">&lt;ipython-input-1-a5c3817716b6&gt;:1</span>\n",
+       "<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\">      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",
-       "<p><em>1</em></p>\n"
+       "<span class=\"ansi-red-fg\">TimeoutError</span>: \n",
+       "</code></pre>\n"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"
@@ -1806,7 +1822,7 @@
       "===========================================================================\n",
       "\n",
       "While Executing Cell #2:\n",
-      "['Traceback (most recent call last):\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_96814/1421292703.py\", line 3, in <module>\\n    s.execute(\\'../tests/error.ipynb\\', exc_stop=True)\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_96814/3609882568.py\", line 18, in execute\\n    self.run_all(nb, exc_stop=exc_stop, preproc=preproc, postproc=postproc,\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_96814/3068237356.py\", line 19, in run_all\\n    if self.exc and exc_stop: raise self.exc from None\\n                              ^^^^^^^^^^^^^^^^^^^^^^^^\\n', '  File \"/Users/iflath/.venv/lib/python3.12/site-packages/IPython/core/interactiveshell.py\", line 3546, in run_code\\n    exec(code_obj, self.user_global_ns, self.user_ns)\\n', '  File \"<ipython-input-1-b968a57a586e>\", line 3, in <module>\\n    foo()\\n', '  File \"/Users/iflath/git/fastai/execnb/tests/err.py\", line 2, in foo\\n    assert 13 == 98\\n           ^^^^^^^^\\n', 'AssertionError\\n']\n",
+      "['Traceback (most recent call last):\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_97767/1421292703.py\", line 3, in <module>\\n    s.execute(\\'../tests/error.ipynb\\', exc_stop=True)\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_97767/3609882568.py\", line 18, in execute\\n    self.run_all(nb, exc_stop=exc_stop, preproc=preproc, postproc=postproc,\\n', '  File \"/var/folders/_8/cpj54rdn0w1fjskv7g8bn2fr0000gn/T/ipykernel_97767/3068237356.py\", line 19, in run_all\\n    if self.exc and exc_stop: raise self.exc from None\\n                              ^^^^^^^^^^^^^^^^^^^^^^^^\\n', '  File \"/Users/iflath/.venv/lib/python3.12/site-packages/IPython/core/interactiveshell.py\", line 3546, in run_code\\n    exec(code_obj, self.user_global_ns, self.user_ns)\\n', '  File \"<ipython-input-1-b968a57a586e>\", line 3, in <module>\\n    foo()\\n', '  File \"/Users/iflath/git/fastai/execnb/tests/err.py\", line 2, in foo\\n    assert 13 == 98\\n           ^^^^^^^^\\n', 'AssertionError\\n']\n",
       "\n"
      ]
     }