fixes #556

Author: jph00

fastcore/_modidx.py

@@ -555,6 +555,7 @@
                               'fastcore.xdg.xdg_state_home': ('xdg.html#xdg_state_home', 'fastcore/xdg.py')},
             'fastcore.xml': { 'fastcore.xml.XT': ('xml.html#xt', 'fastcore/xml.py'),
                               'fastcore.xml._attrmap': ('xml.html#_attrmap', 'fastcore/xml.py'),
+                              'fastcore.xml._to_attr': ('xml.html#_to_attr', 'fastcore/xml.py'),
                               'fastcore.xml.highlight': ('xml.html#highlight', 'fastcore/xml.py'),
                               'fastcore.xml.showtags': ('xml.html#showtags', 'fastcore/xml.py'),
                               'fastcore.xml.to_xml': ('xml.html#to_xml', 'fastcore/xml.py'),

fastcore/py2pyi.py

@@ -1,7 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/12_py2pyi.ipynb.
 
 # %% auto 0
-__all__ = ['imp_mod', 'has_deco', 'sig2str', 'ast_args', 'create_pyi', 'py2pyi']
+__all__ = ['functypes', 'imp_mod', 'has_deco', 'sig2str', 'ast_args', 'create_pyi', 'py2pyi']
 
 # %% ../nbs/12_py2pyi.ipynb 3
 import ast, sys, inspect, re, os, importlib.util, importlib.machinery
@@ -39,6 +39,9 @@ def _repr_markdown_(self:ast.AST):
 {self!r}
 ```"""
 
+# %% ../nbs/12_py2pyi.ipynb 13
+functypes = (ast.FunctionDef,ast.AsyncFunctionDef)
+
 # %% ../nbs/12_py2pyi.ipynb 15
 def _deco_id(d:Union[ast.Name,ast.Attribute])->bool:
     "Get the id for AST node `d`"
@@ -129,7 +132,7 @@ def create_pyi(fn, package=None):
 # %% ../nbs/12_py2pyi.ipynb 62
 @call_parse
 def py2pyi(fname:str,  # The file name to convert
-           package:Union[str,None]=None  # The parent package
+           package:str=None  # The parent package
           ):
     "Convert `fname.py` to `fname.pyi` by removing function bodies and expanding `delegates` kwargs"
-    create_pyi(fname)
+    create_pyi(fname, package)

fastcore/xml.py

@@ -29,7 +29,7 @@ class XT(list): pass
 def xt(tag:str, *c, **kw):
     "Create an XML tag structure `[tag,children,attrs]` for `toxml()`"
     if len(c)==1 and isinstance(c[0], types.GeneratorType): c = tuple(c[0])
-    kw = {_attrmap(k):str(v) for k,v in kw.items() if v is not None}
+    kw = {_attrmap(k):(v if isinstance(v,bool) else str(v)) for k,v in kw.items() if v is not None}
     return XT([tag.lower(),c,kw])
 
 # %% ../nbs/11_xml.ipynb 7
@@ -47,9 +47,15 @@ def xt(tag:str, *c, **kw):
 for o in _all_: _g[o] = partial(xt, o.lower())
 
 # %% ../nbs/11_xml.ipynb 10
-voids = set('area base br col command embed hr img input keygen link meta param source track wbr'.split())
+voids = set('area base br col command embed hr img input keygen link meta param source track wbr !doctype'.split())
 
 # %% ../nbs/11_xml.ipynb 11
+def _to_attr(k,v):
+    if v==True: return str(k)
+    if v==False: return ''
+    return f'{k}="{escape(str(v), quote=False)}"'
+
+# %% ../nbs/11_xml.ipynb 12
 def to_xml(elm, lvl=0):
     "Convert `xt` element tree into an XML string"
     if isinstance(elm, tuple): return '\n'.join(to_xml(o) for o in elm)
@@ -62,7 +68,7 @@ def to_xml(elm, lvl=0):
     tag,cs,attrs = elm
     stag = tag
     if attrs:
-        sattrs = (f'{k}="{escape(str(v), quote=False)}"' for k,v in attrs.items())
+        sattrs = (_to_attr(k,v) for k,v in attrs.items())
         stag += ' ' + ' '.join(sattrs)
 
     cltag = '' if tag in voids else f'</{tag}>'
@@ -72,12 +78,12 @@ def to_xml(elm, lvl=0):
     if tag not in voids: res += f'{sp}{cltag}\n'
     return res
 
-# %% ../nbs/11_xml.ipynb 13
+# %% ../nbs/11_xml.ipynb 14
 def highlight(s, lang='html'):
     "Markdown to syntax-highlight `s` in language `lang`"
     return f'```{lang}\n{to_xml(s)}\n```'
 
-# %% ../nbs/11_xml.ipynb 14
+# %% ../nbs/11_xml.ipynb 15
 def showtags(s):
     return f"""<code><pre>
 {escape(to_xml(s))}

nbs/11_xml.ipynb

@@ -82,7 +82,7 @@
     "def xt(tag:str, *c, **kw):\n",
     "    \"Create an XML tag structure `[tag,children,attrs]` for `toxml()`\"\n",
     "    if len(c)==1 and isinstance(c[0], types.GeneratorType): c = tuple(c[0])\n",
-    "    kw = {_attrmap(k):str(v) for k,v in kw.items() if v is not None}\n",
+    "    kw = {_attrmap(k):(v if isinstance(v,bool) else str(v)) for k,v in kw.items() if v is not None}\n",
     "    return XT([tag.lower(),c,kw])"
    ]
   },
@@ -157,7 +157,21 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "voids = set('area base br col command embed hr img input keygen link meta param source track wbr'.split())"
+    "voids = set('area base br col command embed hr img input keygen link meta param source track wbr !doctype'.split())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "e89496fb",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def _to_attr(k,v):\n",
+    "    if v==True: return str(k)\n",
+    "    if v==False: return ''\n",
+    "    return f'{k}=\"{escape(str(v), quote=False)}\"'"
    ]
   },
   {
@@ -180,7 +194,7 @@
     "    tag,cs,attrs = elm\n",
     "    stag = tag\n",
     "    if attrs:\n",
-    "        sattrs = (f'{k}=\"{escape(str(v), quote=False)}\"' for k,v in attrs.items())\n",
+    "        sattrs = (_to_attr(k,v) for k,v in attrs.items())\n",
     "        stag += ' ' + ' '.join(sattrs)\n",
     "    \n",
     "    cltag = '' if tag in voids else f'</{tag}>'\n",

nbs/12_py2pyi.ipynb

@@ -193,6 +193,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "#| export\n",
     "functypes = (ast.FunctionDef,ast.AsyncFunctionDef)"
    ]
   },
@@ -1164,10 +1165,10 @@
     "#| export\n",
     "@call_parse\n",
     "def py2pyi(fname:str,  # The file name to convert\n",
-    "           package:Union[str,None]=None  # The parent package\n",
+    "           package:str=None  # The parent package\n",
     "          ):\n",
     "    \"Convert `fname.py` to `fname.pyi` by removing function bodies and expanding `delegates` kwargs\"\n",
-    "    create_pyi(fname)"
+    "    create_pyi(fname, package)"
    ]
   },
   {