fixes #571

Author: jph00

fastcore/xml.py

@@ -12,8 +12,10 @@
 # %% ../nbs/11_xml.ipynb 2
 from .utils import *
 
+import types,json
+
 from dataclasses import dataclass, asdict
-import types
+from typing import Mapping
 from functools import partial
 from html import escape
 
@@ -37,7 +39,7 @@ def attrs(self): return self[2]
 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}
+    kw = {_attrmap(k):v for k,v in kw.items() if v is not None}
     return XT(tag.lower(),c,kw)
 
 # %% ../nbs/11_xml.ipynb 7
@@ -65,7 +67,12 @@ def _to_attr(k,v):
     if isinstance(v,bool):
         if v==True : return str(k)
         if v==False: return ''
-    return f'{k}="{escape(str(v), quote=True)}"'
+    if isinstance(v,str): v = escape(v, quote=True)
+    elif isinstance(v, Mapping): v = json.dumps(v)
+    else: v = str(v)
+    qt = '"'
+    if qt in v: qt = "'"
+    return f'{k}={qt}{v}{qt}'
 
 # %% ../nbs/11_xml.ipynb 15
 def to_xml(elm, lvl=0):

nbs/11_xml.ipynb

@@ -30,8 +30,10 @@
     "#| export\n",
     "from fastcore.utils import *\n",
     "\n",
+    "import types,json\n",
+    "\n",
     "from dataclasses import dataclass, asdict\n",
-    "import types\n",
+    "from typing import Mapping\n",
     "from functools import partial\n",
     "from html import escape"
    ]
@@ -90,7 +92,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):(v if isinstance(v,bool) else str(v)) for k,v in kw.items() if v is not None}\n",
+    "    kw = {_attrmap(k):v for k,v in kw.items() if v is not None}\n",
     "    return XT(tag.lower(),c,kw)"
    ]
   },
@@ -142,7 +144,7 @@
       "   (['div',\n",
       "     ('Some text',\n",
       "      ['input', (), {'name': 'me'}],\n",
-      "      ['img', (), {'src': 'filename'}]),\n",
+      "      ['img', (), {'data': {'a': 1}, 'src': 'filename'}]),\n",
       "     {'class': 'myclass'}],),\n",
       "   {}]),\n",
       " {}]\n"
@@ -152,7 +154,7 @@
    "source": [
     "samp = Html(\n",
     "    Head(Title('Some page')),\n",
-    "    Body(Div('Some text', Input(name='me'), Img(src=\"filename\"), klass='myclass'))\n",
+    "    Body(Div('Some text', Input(name='me'), Img(src=\"filename\", data={'a':1}), klass='myclass'))\n",
     ")\n",
     "pprint(samp)"
    ]
@@ -222,7 +224,12 @@
     "    if isinstance(v,bool):\n",
     "        if v==True : return str(k)\n",
     "        if v==False: return ''\n",
-    "    return f'{k}=\"{escape(str(v), quote=True)}\"'"
+    "    if isinstance(v,str): v = escape(v, quote=True)\n",
+    "    elif isinstance(v, Mapping): v = json.dumps(v)\n",
+    "    else: v = str(v)\n",
+    "    qt = '\"'\n",
+    "    if qt in v: qt = \"'\"\n",
+    "    return f'{k}={qt}{v}{qt}'"
    ]
   },
   {
@@ -275,7 +282,7 @@
       "    <div class=\"myclass\">\n",
       "Some text\n",
       "      <input name=\"me\">\n",
-      "      <img src=\"filename\">\n",
+      "      <img src=\"filename\" data='{\"a\": 1}'>\n",
       "    </div>\n",
       "  </body>\n",
       "</html>\n",