fixes #595

Author: jph00

fastcore/_modidx.py

@@ -571,10 +571,10 @@
                               'fastcore.xml.FT.tag': ('xml.html#ft.tag', 'fastcore/xml.py'),
                               'fastcore.xml.Html': ('xml.html#html', 'fastcore/xml.py'),
                               'fastcore.xml.__getattr__': ('xml.html#__getattr__', 'fastcore/xml.py'),
-                              'fastcore.xml._attrmap': ('xml.html#_attrmap', 'fastcore/xml.py'),
                               'fastcore.xml._escape': ('xml.html#_escape', 'fastcore/xml.py'),
                               'fastcore.xml._preproc': ('xml.html#_preproc', 'fastcore/xml.py'),
                               'fastcore.xml._to_attr': ('xml.html#_to_attr', 'fastcore/xml.py'),
+                              'fastcore.xml.attrmap': ('xml.html#attrmap', 'fastcore/xml.py'),
                               'fastcore.xml.ft': ('xml.html#ft', 'fastcore/xml.py'),
                               'fastcore.xml.highlight': ('xml.html#highlight', 'fastcore/xml.py'),
                               'fastcore.xml.showtags': ('xml.html#showtags', 'fastcore/xml.py'),

fastcore/xml.py

@@ -1,13 +1,14 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/11_xml.ipynb.
 
 # %% auto 0
-__all__ = ['voids', 'FT', 'ft', 'Html', 'to_xml', 'highlight', 'showtags', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body',
-           'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S',
-           'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'A', 'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead',
-           'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col', 'Colgroup', 'Form', 'Input', 'Textarea', 'Button',
-           'Select', 'Option', 'Label', 'Fieldset', 'Legend', 'Details', 'Summary', 'Main', 'Header', 'Footer',
-           'Section', 'Article', 'Aside', 'Figure', 'Figcaption', 'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param',
-           'Video', 'Audio', 'Source', 'Canvas', 'Svg', 'Math', 'Script', 'Noscript', 'Template', 'Slot']
+__all__ = ['voids', 'FT', 'attrmap', 'ft', 'Html', 'to_xml', 'highlight', 'showtags', 'Head', 'Title', 'Meta', 'Link', 'Style',
+           'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U',
+           'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'A', 'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table',
+           'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col', 'Colgroup', 'Form', 'Input', 'Textarea',
+           'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend', 'Details', 'Summary', 'Main', 'Header',
+           'Footer', 'Section', 'Article', 'Aside', 'Figure', 'Figcaption', 'Mark', 'Small', 'Iframe', 'Object',
+           'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas', 'Svg', 'Math', 'Script', 'Noscript', 'Template',
+           'Slot']
 
 # %% ../nbs/11_xml.ipynb
 from .utils import *
@@ -19,12 +20,6 @@
 from functools import partial
 from html import escape
 
-# %% ../nbs/11_xml.ipynb
-def _attrmap(o):
-    o = dict(htmlClass='class', cls='class', _class='class', klass='class',
-             _for='for', fr='for', htmlFor='for').get(o, o)
-    return o.lstrip('_').replace('_', '-')
-
 # %% ../nbs/11_xml.ipynb
 class FT(list):
     "A 'Fast Tag' structure, which is a `list` of `[tag,children,attrs]`"
@@ -49,14 +44,21 @@ def __getattr__(self, k):
         return self.attrs[k.lstrip('_').replace('_', '-')]
 
 # %% ../nbs/11_xml.ipynb
-def _preproc(c, kw):
+def attrmap(o):
+    if o=='_': return o
+    o = dict(htmlClass='class', cls='class', _class='class', klass='class',
+             _for='for', fr='for', htmlFor='for').get(o, o)
+    return o.lstrip('_').replace('_', '-')
+
+# %% ../nbs/11_xml.ipynb
+def _preproc(c, kw, attrmap=attrmap):
     if len(c)==1 and isinstance(c[0], (types.GeneratorType, map, filter)): c = tuple(c[0])
-    return c,{_attrmap(k):v for k,v in kw.items() if v is not None}
+    return c,{attrmap(k):v for k,v in kw.items() if v is not None}
 
 # %% ../nbs/11_xml.ipynb
-def ft(tag:str, *c, void_=False, **kw):
+def ft(tag:str, *c, void_=False, attrmap=attrmap, **kw):
     "Create an `FT` structure for `to_xml()`"
-    return FT(tag.lower(),*_preproc(c,kw), void_=void_)
+    return FT(tag.lower(),*_preproc(c,kw,attrmap=attrmap), void_=void_)
 
 # %% ../nbs/11_xml.ipynb
 voids = set('area base br col command embed hr img input keygen link meta param source track wbr !doctype'.split())

nbs/11_xml.ipynb

@@ -49,20 +49,6 @@
     "from pprint import pprint"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4dbb9a59",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#| export\n",
-    "def _attrmap(o):\n",
-    "    o = dict(htmlClass='class', cls='class', _class='class', klass='class',\n",
-    "             _for='for', fr='for', htmlFor='for').get(o, o)\n",
-    "    return o.lstrip('_').replace('_', '-')"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -94,6 +80,21 @@
     "        return self.attrs[k.lstrip('_').replace('_', '-')]"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d6069e01",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def attrmap(o):\n",
+    "    if o=='_': return o\n",
+    "    o = dict(htmlClass='class', cls='class', _class='class', klass='class',\n",
+    "             _for='for', fr='for', htmlFor='for').get(o, o)\n",
+    "    return o.lstrip('_').replace('_', '-')"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -102,9 +103,9 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "def _preproc(c, kw):\n",
+    "def _preproc(c, kw, attrmap=attrmap):\n",
     "    if len(c)==1 and isinstance(c[0], (types.GeneratorType, map, filter)): c = tuple(c[0])\n",
-    "    return c,{_attrmap(k):v for k,v in kw.items() if v is not None}"
+    "    return c,{attrmap(k):v for k,v in kw.items() if v is not None}"
    ]
   },
   {
@@ -115,9 +116,9 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def ft(tag:str, *c, void_=False, **kw):\n",
+    "def ft(tag:str, *c, void_=False, attrmap=attrmap, **kw):\n",
     "    \"Create an `FT` structure for `to_xml()`\"\n",
-    "    return FT(tag.lower(),*_preproc(c,kw), void_=void_)"
+    "    return FT(tag.lower(),*_preproc(c,kw,attrmap=attrmap), void_=void_)"
    ]
   },
   {