fixes #561

Author: jph00

fastcore/_modidx.py

@@ -554,6 +554,10 @@
                               '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.__init__': ('xml.html#xt.__init__', '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._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.py

@@ -23,14 +23,21 @@ def _attrmap(o):
     return o.lstrip('_').replace('_', '-')
 
 # %% ../nbs/11_xml.ipynb 5
-class XT(list): pass
+class XT(list):
+    def __init__(self, tag, cs, attrs): super().__init__([tag, cs, attrs])
+    @property
+    def tag(self): return self[0]
+    @property
+    def children(self): return self[1]
+    @property
+    def attrs(self): return self[2]
 
 # %% ../nbs/11_xml.ipynb 6
 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):(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])
+    return XT(tag.lower(),c,kw)
 
 # %% ../nbs/11_xml.ipynb 7
 _g = globals()
@@ -46,16 +53,16 @@ def xt(tag:str, *c, **kw):
 
 for o in _all_: _g[o] = partial(xt, o.lower())
 
-# %% ../nbs/11_xml.ipynb 10
+# %% ../nbs/11_xml.ipynb 12
 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
+# %% ../nbs/11_xml.ipynb 13
 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
+# %% ../nbs/11_xml.ipynb 14
 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)
@@ -78,15 +85,15 @@ def to_xml(elm, lvl=0):
     if tag not in voids: res += f'{sp}{cltag}\n'
     return res
 
-# %% ../nbs/11_xml.ipynb 14
-def highlight(s, lang='html'):
+# %% ../nbs/11_xml.ipynb 16
+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 15
+# %% ../nbs/11_xml.ipynb 17
 def showtags(s):
     return f"""<code><pre>
 {escape(to_xml(s))}
 </code></pre>"""
 
-XT._repr_html_ = showtags
+XT._repr_markdown_ = highlight

nbs/01_basics.ipynb

@@ -33,8 +33,7 @@
     "from __future__ import annotations\n",
     "from fastcore.test import *\n",
     "from nbdev.showdoc import *\n",
-    "from fastcore.nb_imports import *\n",
-    "from inspect import get_annotations"
+    "from fastcore.nb_imports import *"
    ]
   },
   {
@@ -652,7 +651,7 @@
     "test_eq(t.a, 1)\n",
     "test_eq(t.b, 3)\n",
     "test_eq(t, pickle.loads(pickle.dumps(t)))\n",
-    "test_eq(get_annotations(_t), {'b':int, 'a':typing.Any})\n",
+    "test_eq(_t.__annotations__, {'b':int, 'a':typing.Any})\n",
     "repr(t)"
    ]
   },

nbs/11_xml.ipynb

@@ -68,7 +68,14 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "class XT(list): pass"
+    "class XT(list):\n",
+    "    def __init__(self, tag, cs, attrs): super().__init__([tag, cs, attrs])\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]"
    ]
   },
   {
@@ -83,7 +90,7 @@
     "    \"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):(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])"
+    "    return XT(tag.lower(),c,kw)"
    ]
   },
   {
@@ -149,6 +156,37 @@
     "pprint(samp)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "314eb4bc",
+   "metadata": {},
+   "source": [
+    "The three elements of the list can also be accessed with property names, so you don't have to remember their order."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5c6c57e9",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "p\n",
+      "('Some text',)\n",
+      "{'id': 'myid'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "elem = P('Some text', id=\"myid\")\n",
+    "print(elem.tag)\n",
+    "print(elem.children)\n",
+    "print(elem.attrs)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -247,7 +285,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def highlight(s, lang='html'):\n",
+    "def highlight(s, lang='xml'):\n",
     "    \"Markdown to syntax-highlight `s` in language `lang`\"\n",
     "    return f'```{lang}\\n{to_xml(s)}\\n```'"
    ]
@@ -265,7 +303,7 @@
     "{escape(to_xml(s))}\n",
     "</code></pre>\"\"\"\n",
     "\n",
-    "XT._repr_html_ = showtags"
+    "XT._repr_markdown_ = highlight"
    ]
   },
   {