fixes #572

Author: jph00

fastcore/_modidx.py

@@ -558,7 +558,9 @@
                               'fastcore.xdg.xdg_runtime_dir': ('xdg.html#xdg_runtime_dir', 'fastcore/xdg.py'),
                               '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.XT.__getattr__': ('xml.html#xt.__getattr__', 'fastcore/xml.py'),
                               'fastcore.xml.XT.__init__': ('xml.html#xt.__init__', 'fastcore/xml.py'),
+                              'fastcore.xml.XT.__setattr__': ('xml.html#xt.__setattr__', 'fastcore/xml.py'),
                               'fastcore.xml.XT.attrs': ('xml.html#xt.attrs', 'fastcore/xml.py'),
                               'fastcore.xml.XT.children': ('xml.html#xt.children', 'fastcore/xml.py'),
                               'fastcore.xml.XT.tag': ('xml.html#xt.tag', 'fastcore/xml.py'),

fastcore/xml.py

@@ -27,14 +27,22 @@ def _attrmap(o):
 
 # %% ../nbs/11_xml.ipynb 5
 class XT(list):
-    def __init__(self, tag, cs, attrs): super().__init__([tag, cs, attrs])
+    def __init__(self, tag, cs, attrs=None, **kwargs): super().__init__([tag, cs, {**(attrs or {}), **kwargs}])
     @property
     def tag(self): return self[0]
     @property
     def children(self): return self[1]
     @property
     def attrs(self): return self[2]
 
+    def __setattr__(self, k, v):
+        if k.startswith('__') or k in ('tag','cs','attrs'): return super().__setattr__(k,v)
+        self.attrs[k.lstrip('_').replace('_', '-')] = v
+
+    def __getattr__(self, k):
+        if k.startswith('__') or k not in self.attrs: raise AttributeError(k)
+        return self.attrs[k.lstrip('_').replace('_', '-')]
+
 # %% ../nbs/11_xml.ipynb 6
 def xt(tag:str, *c, **kw):
     "Create an XML tag structure `[tag,children,attrs]` for `toxml()`"
@@ -56,13 +64,13 @@ def xt(tag:str, *c, **kw):
 
 for o in _all_: _g[o] = partial(xt, o.lower())
 
-# %% ../nbs/11_xml.ipynb 12
+# %% ../nbs/11_xml.ipynb 14
 voids = set('area base br col command embed hr img input keygen link meta param source track wbr !doctype'.split())
 
-# %% ../nbs/11_xml.ipynb 13
+# %% ../nbs/11_xml.ipynb 15
 def _escape(s): return '' if s is None else escape(s) if isinstance(s, str) else s
 
-# %% ../nbs/11_xml.ipynb 14
+# %% ../nbs/11_xml.ipynb 16
 def _to_attr(k,v):
     if isinstance(v,bool):
         if v==True : return str(k)
@@ -74,7 +82,7 @@ def _to_attr(k,v):
     if qt in v: qt = "'"
     return f'{k}={qt}{v}{qt}'
 
-# %% ../nbs/11_xml.ipynb 15
+# %% ../nbs/11_xml.ipynb 17
 def to_xml(elm, lvl=0):
     "Convert `xt` element tree into an XML string"
     if elm is None: return ''
@@ -98,12 +106,12 @@ def to_xml(elm, lvl=0):
     if tag not in voids: res += f'{sp}{cltag}\n'
     return res
 
-# %% ../nbs/11_xml.ipynb 17
+# %% ../nbs/11_xml.ipynb 19
 def highlight(s, lang='xml'):
     "Markdown to syntax-highlight `s` in language `lang`"
     return f'```{lang}\n{to_xml(s)}\n```'
 
-# %% ../nbs/11_xml.ipynb 18
+# %% ../nbs/11_xml.ipynb 20
 def showtags(s):
     return f"""<code><pre>
 {escape(to_xml(s))}

nbs/11_xml.ipynb

@@ -72,13 +72,21 @@
    "source": [
     "#|export\n",
     "class XT(list):\n",
-    "    def __init__(self, tag, cs, attrs): super().__init__([tag, cs, attrs])\n",
+    "    def __init__(self, tag, cs, attrs=None, **kwargs): super().__init__([tag, cs, {**(attrs or {}), **kwargs}])\n",
     "    @property\n",
     "    def tag(self): return self[0]\n",
     "    @property\n",
     "    def children(self): return self[1]\n",
     "    @property\n",
-    "    def attrs(self): return self[2]"
+    "    def attrs(self): return self[2]\n",
+    "\n",
+    "    def __setattr__(self, k, v):\n",
+    "        if k.startswith('__') or k in ('tag','cs','attrs'): return super().__setattr__(k,v)\n",
+    "        self.attrs[k.lstrip('_').replace('_', '-')] = v\n",
+    "\n",
+    "    def __getattr__(self, k):\n",
+    "        if k.startswith('__') or k not in self.attrs: raise AttributeError(k)\n",
+    "        return self.attrs[k.lstrip('_').replace('_', '-')]"
    ]
   },
   {
@@ -144,7 +152,7 @@
       "   (['div',\n",
       "     ('Some text',\n",
       "      ['input', (), {'name': 'me'}],\n",
-      "      ['img', (), {'data': {'a': 1}, 'src': 'filename'}]),\n",
+      "      ['img', (), {'data': 1, 'src': 'filename'}]),\n",
       "     {'class': 'myclass'}],),\n",
       "   {}]),\n",
       " {}]\n"
@@ -154,7 +162,7 @@
    "source": [
     "samp = Html(\n",
     "    Head(Title('Some page')),\n",
-    "    Body(Div('Some text', Input(name='me'), Img(src=\"filename\", data={'a':1}), klass='myclass'))\n",
+    "    Body(Div('Some text', Input(name='me'), Img(src=\"filename\", data=1), klass='myclass'))\n",
     ")\n",
     "pprint(samp)"
    ]
@@ -190,6 +198,44 @@
     "print(elem.attrs)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "bb61f88e",
+   "metadata": {},
+   "source": [
+    "You can also get and set attrs directly:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5c7f175d",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "newid\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "['p', ('Some text',), {'id': 'newid'}]"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "elem.id = 'newid'\n",
+    "print(elem.id)\n",
+    "elem"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -282,7 +328,7 @@
       "    <div class=\"myclass\">\n",
       "Some text\n",
       "      <input name=\"me\">\n",
-      "      <img src=\"filename\" data='{\"a\": 1}'>\n",
+      "      <img src=\"filename\" data=\"1\">\n",
       "    </div>\n",
       "  </body>\n",
       "</html>\n",
@@ -291,7 +337,8 @@
     }
    ],
    "source": [
-    "print(to_xml(samp))"
+    "h = to_xml(samp)\n",
+    "print(h)"
    ]
   },
   {