fixes #953

Author: jph00

nbdev/_modidx.py

@@ -101,6 +101,7 @@
                              'nbdev.maker._import2relative': ('09_API/maker.html#_import2relative', 'nbdev/maker.py'),
                              'nbdev.maker._mark_text_ranges': ('09_API/maker.html#_mark_text_ranges', 'nbdev/maker.py'),
                              'nbdev.maker._retr_mdoc': ('09_API/maker.html#_retr_mdoc', 'nbdev/maker.py'),
+                             'nbdev.maker._targets': ('09_API/maker.html#_targets', 'nbdev/maker.py'),
                              'nbdev.maker._val_or_id': ('09_API/maker.html#_val_or_id', 'nbdev/maker.py'),
                              'nbdev.maker._wants': ('09_API/maker.html#_wants', 'nbdev/maker.py'),
                              'nbdev.maker.decor_id': ('09_API/maker.html#decor_id', 'nbdev/maker.py'),

nbdev/maker.py

@@ -87,6 +87,8 @@ def _filt_dec(x): return decor_id(x).startswith('patch')
 def _wants(o): return isinstance(o,_def_types) and not any(L(o.decorator_list).filter(_filt_dec))
 
 # %% ../nbs/09_API/02_maker.ipynb 20
+def _targets(o): return [o.target] if isinstance(o, ast.AnnAssign) else o.targets
+
 @patch
 def make_all(self:ModuleMaker, cells):
     "Create `__all__` with all exports in `cells`"
@@ -95,11 +97,11 @@ def make_all(self:ModuleMaker, cells):
     # include anything mentioned in "_all_", even if otherwise private
     # NB: "_all_" can include strings (names), or symbols, so we look for "id" or "value"
     assigns = trees.filter(risinstance(_assign_types))
-    all_assigns = assigns.filter(lambda o: getattr(o.targets[0],'id',None)=='_all_')
+    all_assigns = assigns.filter(lambda o: getattr(_targets(o)[0],'id',None)=='_all_')
     all_vals = all_assigns.map(_val_or_id).concat()
     syms = trees.filter(_wants).attrgot('name')
     # assignment targets (NB: can be multiple, e.g. "a=b=c", and/or destructuring e.g "a,b=(1,2)")
-    assign_targs = L(L(assn.targets).map(_all_targets).concat() for assn in assigns).concat()
+    assign_targs = L(L(_targets(assn)).map(_all_targets).concat() for assn in assigns).concat()
     exports = (assign_targs.attrgot('id')+syms).filter(lambda o: o and o[0]!='_')
     return (exports+all_vals).unique()
 

nbs/09_API/02_maker.ipynb

@@ -276,6 +276,9 @@
    "outputs": [],
    "source": [
     "#|export\n",
+    "\n",
+    "def _targets(o): return [o.target] if isinstance(o, ast.AnnAssign) else o.targets\n",
+    "\n",
     "@patch\n",
     "def make_all(self:ModuleMaker, cells):\n",
     "    \"Create `__all__` with all exports in `cells`\"\n",
@@ -284,11 +287,11 @@
     "    # include anything mentioned in \"_all_\", even if otherwise private\n",
     "    # NB: \"_all_\" can include strings (names), or symbols, so we look for \"id\" or \"value\"\n",
     "    assigns = trees.filter(risinstance(_assign_types))\n",
-    "    all_assigns = assigns.filter(lambda o: getattr(o.targets[0],'id',None)=='_all_')\n",
+    "    all_assigns = assigns.filter(lambda o: getattr(_targets(o)[0],'id',None)=='_all_')\n",
     "    all_vals = all_assigns.map(_val_or_id).concat()\n",
     "    syms = trees.filter(_wants).attrgot('name')\n",
     "    # assignment targets (NB: can be multiple, e.g. \"a=b=c\", and/or destructuring e.g \"a,b=(1,2)\")\n",
-    "    assign_targs = L(L(assn.targets).map(_all_targets).concat() for assn in assigns).concat()\n",
+    "    assign_targs = L(L(_targets(assn)).map(_all_targets).concat() for assn in assigns).concat()\n",
     "    exports = (assign_targs.attrgot('id')+syms).filter(lambda o: o and o[0]!='_')\n",
     "    return (exports+all_vals).unique()"
    ]