update Importing Notebooks example to v4

examples/IPython Kernel/Importing Notebooks.ipynb

@@ -22,7 +22,7 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -33,14 +33,15 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
    "source": [
+    "import nbformat\n",
+    "\n",
     "from IPython import get_ipython\n",
-    "from IPython.nbformat import current\n",
     "from IPython.core.interactiveshell import InteractiveShell"
    ]
   },
@@ -56,7 +57,7 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -110,7 +111,7 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -126,11 +127,10 b''
     "        \"\"\"import a notebook as a module\"\"\"\n",
     "        path = find_notebook(fullname, self.path)\n",
     "        \n",
-    "        print (\"importing IPython notebook from %s\" % path)\n",
+    "        print (\"importing notebook from %s\" % path)\n",
     "                                       \n",
     "        # load the notebook object\n",
-    "        with io.open(path, 'r', encoding='utf-8') as f:\n",
-    "            nb = current.read(f, 'json')\n",
+    "        nb = nbformat.read(path, as_version=4)\n",
     "        \n",
     "        \n",
     "        # create the module and add it to sys.modules\n",
@@ -148,10 +148,10 b''
     "        self.shell.user_ns = mod.__dict__\n",
     "        \n",
     "        try:\n",
-    "          for cell in nb.worksheets[0].cells:\n",
-    "            if cell.cell_type == 'code' and cell.language == 'python':\n",
+    "          for cell in nb.cells:\n",
+    "            if cell.cell_type == 'code':\n",
     "                # transform the input to executable Python\n",
-    "                code = self.shell.input_transformer_manager.transform_cell(cell.input)\n",
+    "                code = self.shell.input_transformer_manager.transform_cell(cell.source)\n",
     "                # run the code in themodule\n",
     "                exec(code, mod.__dict__)\n",
     "        finally:\n",
@@ -186,7 +186,7 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -228,7 +228,7 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
@@ -248,11 +248,19 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "__init__.py       \u001b[34m__pycache__\u001b[m\u001b[m/      mynotebook.ipynb  \u001b[34mnbs\u001b[m\u001b[m/\r\n"
+     ]
+    }
+   ],
    "source": [
     "ls nbpackage"
    ]
@@ -281,11 +289,88 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "\n",
+       "<style type='text/css'>\n",
+       ".hll { background-color: #ffffcc }\n",
+       ".c { color: #408080; font-style: italic } /* Comment */\n",
+       ".err { border: 1px solid #FF0000 } /* Error */\n",
+       ".k { color: #008000; font-weight: bold } /* Keyword */\n",
+       ".o { color: #666666 } /* Operator */\n",
+       ".cm { color: #408080; font-style: italic } /* Comment.Multiline */\n",
+       ".cp { color: #BC7A00 } /* Comment.Preproc */\n",
+       ".c1 { color: #408080; font-style: italic } /* Comment.Single */\n",
+       ".cs { color: #408080; font-style: italic } /* Comment.Special */\n",
+       ".gd { color: #A00000 } /* Generic.Deleted */\n",
+       ".ge { font-style: italic } /* Generic.Emph */\n",
+       ".gr { color: #FF0000 } /* Generic.Error */\n",
+       ".gh { color: #000080; font-weight: bold } /* Generic.Heading */\n",
+       ".gi { color: #00A000 } /* Generic.Inserted */\n",
+       ".go { color: #888888 } /* Generic.Output */\n",
+       ".gp { color: #000080; font-weight: bold } /* Generic.Prompt */\n",
+       ".gs { font-weight: bold } /* Generic.Strong */\n",
+       ".gu { color: #800080; font-weight: bold } /* Generic.Subheading */\n",
+       ".gt { color: #0044DD } /* Generic.Traceback */\n",
+       ".kc { color: #008000; font-weight: bold } /* Keyword.Constant */\n",
+       ".kd { color: #008000; font-weight: bold } /* Keyword.Declaration */\n",
+       ".kn { color: #008000; font-weight: bold } /* Keyword.Namespace */\n",
+       ".kp { color: #008000 } /* Keyword.Pseudo */\n",
+       ".kr { color: #008000; font-weight: bold } /* Keyword.Reserved */\n",
+       ".kt { color: #B00040 } /* Keyword.Type */\n",
+       ".m { color: #666666 } /* Literal.Number */\n",
+       ".s { color: #BA2121 } /* Literal.String */\n",
+       ".na { color: #7D9029 } /* Name.Attribute */\n",
+       ".nb { color: #008000 } /* Name.Builtin */\n",
+       ".nc { color: #0000FF; font-weight: bold } /* Name.Class */\n",
+       ".no { color: #880000 } /* Name.Constant */\n",
+       ".nd { color: #AA22FF } /* Name.Decorator */\n",
+       ".ni { color: #999999; font-weight: bold } /* Name.Entity */\n",
+       ".ne { color: #D2413A; font-weight: bold } /* Name.Exception */\n",
+       ".nf { color: #0000FF } /* Name.Function */\n",
+       ".nl { color: #A0A000 } /* Name.Label */\n",
+       ".nn { color: #0000FF; font-weight: bold } /* Name.Namespace */\n",
+       ".nt { color: #008000; font-weight: bold } /* Name.Tag */\n",
+       ".nv { color: #19177C } /* Name.Variable */\n",
+       ".ow { color: #AA22FF; font-weight: bold } /* Operator.Word */\n",
+       ".w { color: #bbbbbb } /* Text.Whitespace */\n",
+       ".mb { color: #666666 } /* Literal.Number.Bin */\n",
+       ".mf { color: #666666 } /* Literal.Number.Float */\n",
+       ".mh { color: #666666 } /* Literal.Number.Hex */\n",
+       ".mi { color: #666666 } /* Literal.Number.Integer */\n",
+       ".mo { color: #666666 } /* Literal.Number.Oct */\n",
+       ".sb { color: #BA2121 } /* Literal.String.Backtick */\n",
+       ".sc { color: #BA2121 } /* Literal.String.Char */\n",
+       ".sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */\n",
+       ".s2 { color: #BA2121 } /* Literal.String.Double */\n",
+       ".se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */\n",
+       ".sh { color: #BA2121 } /* Literal.String.Heredoc */\n",
+       ".si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */\n",
+       ".sx { color: #008000 } /* Literal.String.Other */\n",
+       ".sr { color: #BB6688 } /* Literal.String.Regex */\n",
+       ".s1 { color: #BA2121 } /* Literal.String.Single */\n",
+       ".ss { color: #19177C } /* Literal.String.Symbol */\n",
+       ".bp { color: #008000 } /* Name.Builtin.Pseudo */\n",
+       ".vc { color: #19177C } /* Name.Variable.Class */\n",
+       ".vg { color: #19177C } /* Name.Variable.Global */\n",
+       ".vi { color: #19177C } /* Name.Variable.Instance */\n",
+       ".il { color: #666666 } /* Literal.Number.Integer.Long */\n",
+       "</style>\n"
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "from pygments import highlight\n",
     "from pygments.lexers import PythonLexer\n",
@@ -307,21 +392,49 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<h4>markdown cell</h4>\n",
+       "<pre># My Notebook</pre>\n",
+       "<h4>code cell</h4>\n",
+       "<div class=\"highlight\"><pre><span class=\"k\">def</span> <span class=\"nf\">foo</span><span class=\"p\">():</span>\n",
+       "    <span class=\"k\">return</span> <span class=\"s\">&quot;foo&quot;</span>\n",
+       "</pre></div>\n",
+       "\n",
+       "<h4>code cell</h4>\n",
+       "<div class=\"highlight\"><pre><span class=\"k\">def</span> <span class=\"nf\">has_ip_syntax</span><span class=\"p\">():</span>\n",
+       "    <span class=\"n\">listing</span> <span class=\"o\">=</span> <span class=\"err\">!</span><span class=\"n\">ls</span>\n",
+       "    <span class=\"k\">return</span> <span class=\"n\">listing</span>\n",
+       "</pre></div>\n",
+       "\n",
+       "<h4>code cell</h4>\n",
+       "<div class=\"highlight\"><pre><span class=\"k\">def</span> <span class=\"nf\">whatsmyname</span><span class=\"p\">():</span>\n",
+       "    <span class=\"k\">return</span> <span class=\"n\">__name__</span>\n",
+       "</pre></div>\n"
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "def show_notebook(fname):\n",
     "    \"\"\"display a short summary of the cells of a notebook\"\"\"\n",
-    "    with io.open(fname, 'r', encoding='utf-8') as f:\n",
-    "        nb = current.read(f, 'json')\n",
+    "    nb = nbformat.read(fname, as_version=4)\n",
     "    html = []\n",
-    "    for cell in nb.worksheets[0].cells:\n",
+    "    for cell in nb.cells:\n",
     "        html.append(\"<h4>%s cell</h4>\" % cell.cell_type)\n",
     "        if cell.cell_type == 'code':\n",
-    "            html.append(highlight(cell.input, lexer, formatter))\n",
+    "            html.append(highlight(cell.source, lexer, formatter))\n",
     "        else:\n",
     "            html.append(\"<pre>%s</pre>\" % cell.source)\n",
     "    display(HTML('\\n'.join(html)))\n",
@@ -341,11 +454,19 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 10,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "importing notebook from /Users/minrk/dev/ip/mine/examples/IPython Kernel/nbpackage/mynotebook.ipynb\n"
+     ]
+    }
+   ],
    "source": [
     "from nbpackage import mynotebook"
    ]
@@ -359,11 +480,22 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'foo'"
+      ]
+     },
+     "execution_count": 11,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "mynotebook.foo()"
    ]
@@ -379,11 +511,46 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "['Animations Using clear_output.ipynb',\n",
+       " 'Background Jobs.ipynb',\n",
+       " 'Beyond Plain Python.ipynb',\n",
+       " 'Capturing Output.ipynb',\n",
+       " 'Cell Magics.ipynb',\n",
+       " 'Custom Display Logic.ipynb',\n",
+       " 'Importing Notebooks.ipynb',\n",
+       " 'Index.ipynb',\n",
+       " 'Plotting in the Notebook.ipynb',\n",
+       " 'Raw Input in the Notebook.ipynb',\n",
+       " 'Rich Output.ipynb',\n",
+       " 'Script Magics.ipynb',\n",
+       " 'SymPy.ipynb',\n",
+       " 'Terminal Usage.ipynb',\n",
+       " 'Third Party Rich Output.ipynb',\n",
+       " 'Trapezoid Rule.ipynb',\n",
+       " 'Working With External Code.ipynb',\n",
+       " '__pycache__',\n",
+       " 'data',\n",
+       " 'example-demo.py',\n",
+       " 'gui',\n",
+       " 'ipython-completion.bash',\n",
+       " 'ipython-get-history.py',\n",
+       " 'ipython.desktop',\n",
+       " 'nbpackage']"
+      ]
+     },
+     "execution_count": 12,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "mynotebook.has_ip_syntax()"
    ]
@@ -405,11 +572,19 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 13,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "__init__.py  \u001b[34m__pycache__\u001b[m\u001b[m/ other.ipynb\r\n"
+     ]
+    }
+   ],
    "source": [
     "ls nbpackage/nbs"
    ]
@@ -424,22 +599,58 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 14,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<h4>markdown cell</h4>\n",
+       "<pre>This notebook just defines `bar`</pre>\n",
+       "<h4>code cell</h4>\n",
+       "<div class=\"highlight\"><pre><span class=\"k\">def</span> <span class=\"nf\">bar</span><span class=\"p\">(</span><span class=\"n\">x</span><span class=\"p\">):</span>\n",
+       "    <span class=\"k\">return</span> <span class=\"s\">&quot;bar&quot;</span> <span class=\"o\">*</span> <span class=\"n\">x</span>\n",
+       "</pre></div>\n"
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "show_notebook(os.path.join(\"nbpackage\", \"nbs\", \"other.ipynb\"))"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 15,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "importing notebook from /Users/minrk/dev/ip/mine/examples/IPython Kernel/nbpackage/nbs/other.ipynb\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "'barbarbarbarbar'"
+      ]
+     },
+     "execution_count": 15,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "from nbpackage.nbs import other\n",
     "other.bar(5)"
@@ -456,14 +667,25 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 16,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'/Users/minrk/dev/ip/mine/IPython/utils/inside_ipython.ipynb'"
+      ]
+     },
+     "execution_count": 16,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "import shutil\n",
-    "from IPython.utils.path import get_ipython_package_dir\n",
+    "from IPython.paths import get_ipython_package_dir\n",
     "\n",
     "utils = os.path.join(get_ipython_package_dir(), 'utils')\n",
     "shutil.copy(os.path.join(\"nbpackage\", \"mynotebook.ipynb\"),\n",
@@ -480,11 +702,29 b''
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 17,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "importing notebook from /Users/minrk/dev/ip/mine/IPython/utils/inside_ipython.ipynb\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "'IPython.utils.inside_ipython'"
+      ]
+     },
+     "execution_count": 17,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "from IPython.utils import inside_ipython\n",
     "inside_ipython.whatsmyname()"