fix issue 450

Author: hamelsmu

nbdev/export2html.py

@@ -2,11 +2,10 @@
 
 __all__ = ['HTMLParseAttrs', 'remove_widget_state', 'upd_metadata', 'hide_cells', 'clean_exports', 'treat_backticks',
            'add_jekyll_notes', 'copy_images', 'adapt_img_path', 'escape_latex', 'collapse_cells', 'remove_hidden',
-           'find_default_level', 'nb_code_cell', 'add_show_docs', 'add_show_docs', 'remove_fake_headers',
-           'remove_empty', 'get_metadata', 'ExecuteShowDocPreprocessor', 'execute_nb', 'cite2link', 'write_tmpl',
-           'write_tmpls', 'nbdev_build_lib', 'nbdev_exporter', 'process_cells', 'process_cell', 'convert_nb',
-           'notebook2html', 'convert_md', 'nbdev_detach', 'make_readme', 'nbdev_build_docs', 'nbdev_nb2md',
-           'create_default_sidebar', 'make_sidebar']
+           'find_default_level', 'nb_code_cell', 'add_show_docs', 'remove_fake_headers', 'remove_empty', 'get_metadata',
+           'ExecuteShowDocPreprocessor', 'execute_nb', 'cite2link', 'write_tmpl', 'write_tmpls', 'nbdev_build_lib',
+           'nbdev_exporter', 'process_cells', 'process_cell', 'convert_nb', 'notebook2html', 'convert_md',
+           'nbdev_detach', 'make_readme', 'nbdev_build_docs', 'nbdev_nb2md', 'create_default_sidebar', 'make_sidebar']
 
 # Cell
 from .imports import *
@@ -255,27 +254,6 @@ def nb_code_cell(source):
 def _show_doc_cell(name, cls_lvl=None):
     return nb_code_cell(f"show_doc({name}{'' if cls_lvl is None else f', default_cls_level={cls_lvl}'})")
 
-def add_show_docs(cells, cls_lvl=None):
-    "Add `show_doc` for each exported function or class"
-    documented = []
-    for cell in cells:
-        m = check_re(cell, _re_show_doc)
-        if not m: continue
-        documented.append(m.group(1))
-
-    def _documented(name): return name in documented
-
-    for cell in cells:
-        res.append(cell)
-        if check_re(cell, _re_export):
-            for n in export_names(cell['source'], func_only=True):
-                if not _documented(n): res.insert(len(res)-1, _show_doc_cell(n, cls_lvl=cls_lvl))
-    return res
-
-# Cell
-def _show_doc_cell(name, cls_lvl=None):
-    return nb_code_cell(f"show_doc({name}{'' if cls_lvl is None else f', default_cls_level={cls_lvl}'})")
-
 def add_show_docs(cells, cls_lvl=None):
     "Add `show_doc` for each exported function or class"
     documented = L(cells).map(check_re, pat=_re_show_doc).filter().map(Self.group(1))

nbs/03_export2html.ipynb

@@ -935,34 +935,6 @@
     "    return {'cell_type': 'code', 'execution_count': None, 'metadata': {}, 'outputs': [], 'source': source}"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "def _show_doc_cell(name, cls_lvl=None):\n",
-    "    return nb_code_cell(f\"show_doc({name}{'' if cls_lvl is None else f', default_cls_level={cls_lvl}'})\")\n",
-    "\n",
-    "def add_show_docs(cells, cls_lvl=None):\n",
-    "    \"Add `show_doc` for each exported function or class\"\n",
-    "    documented = []\n",
-    "    for cell in cells:\n",
-    "        m = check_re(cell, _re_show_doc)\n",
-    "        if not m: continue\n",
-    "        documented.append(m.group(1))\n",
-    "\n",
-    "    def _documented(name): return name in documented\n",
-    "\n",
-    "    for cell in cells:\n",
-    "        res.append(cell)\n",
-    "        if check_re(cell, _re_export):\n",
-    "            for n in export_names(cell['source'], func_only=True):\n",
-    "                if not _documented(n): res.insert(len(res)-1, _show_doc_cell(n, cls_lvl=cls_lvl))\n",
-    "    return res"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1778,7 +1750,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/var/folders/3y/vb18nv5d5mv5jy4_qtf92j9c0000gn/T/tmpea7py40r\n"
+      "/var/folders/3y/vb18nv5d5mv5jy4_qtf92j9c0000gn/T/tmposaq1isq\n"
      ]
     }
    ],
@@ -1839,20 +1811,20 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "converting: /Users/hamelsmu/github/nbdev/nbs/99_search.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/nbdev_comments.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/00_export.ipynb\n",
       "converting: /Users/hamelsmu/github/nbdev/nbs/03_export2html.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/example.ipynb\n",
       "converting: /Users/hamelsmu/github/nbdev/nbs/04_test.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/00_export.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/07_clean.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/tutorial.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/index.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/01_sync.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/06_cli.ipynb\n",
       "converting: /Users/hamelsmu/github/nbdev/nbs/05_merge.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/02_showdoc.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/index.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/example.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/99_search.ipynb\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/07_clean.ipynb\n",
       "converting: /Users/hamelsmu/github/nbdev/nbs/tutorial_colab.ipynb\n",
-      "converting: /Users/hamelsmu/github/nbdev/nbs/nbdev_comments.ipynbconverting: /Users/hamelsmu/github/nbdev/nbs/02_showdoc.ipynb\n",
-      "\n"
+      "converting: /Users/hamelsmu/github/nbdev/nbs/01_sync.ipynbconverting: /Users/hamelsmu/github/nbdev/nbs/06_cli.ipynb\n",
+      "\n",
+      "converting: /Users/hamelsmu/github/nbdev/nbs/tutorial.ipynb\n"
      ]
     }
    ],