indent param to to_xml

Author: jph00

fastcore/xml.py

@@ -104,14 +104,15 @@ def _to_attr(k,v):
     return f'{k}={qt}{v}{qt}'
 
 # %% ../nbs/11_xml.ipynb
-def to_xml(elm, lvl=0):
+def to_xml(elm, lvl=0, indent:bool=True):
     "Convert `ft` element tree into an XML string"
+    nl = '\n'
+    if not indent: lvl,nl = 0,''
     if elm is None: return ''
-    if isinstance(elm, tuple): return '\n'.join(to_xml(o) for o in elm)
+    if isinstance(elm, tuple): return f'{nl}'.join(to_xml(o, indent=indent) for o in elm)
     if hasattr(elm, '__ft__'): elm = elm.__ft__()
-    if isinstance(elm, bytes): return elm.decode('utf-8')
     sp = ' ' * lvl
-    if not isinstance(elm, list): return f'{_escape(elm)}\n'
+    if not isinstance(elm, list): return f'{_escape(elm)}{nl}'
 
     tag,cs,attrs = elm
     stag = tag
@@ -121,12 +122,12 @@ def to_xml(elm, lvl=0):
 
     isvoid = getattr(elm, 'void_', False)
     cltag = '' if isvoid else f'</{tag}>'
-    if not cs: return f'{sp}<{stag}>{cltag}\n'
+    if not cs: return f'{sp}<{stag}>{cltag}{nl}'
     if len(cs)==1 and not isinstance(cs[0],(list,tuple)) and not hasattr(cs[0],'__ft__'):
-        return f'{sp}<{stag}>{_escape(cs[0])}{cltag}\n'
-    res = f'{sp}<{stag}>\n'
-    res += ''.join(to_xml(c, lvl=lvl+2) for c in cs)
-    if not isvoid: res += f'{sp}{cltag}\n'
+        return f'{sp}<{stag}>{_escape(cs[0])}{cltag}{nl}'
+    res = f'{sp}<{stag}>{nl}'
+    res += ''.join(to_xml(c, lvl=lvl+2, indent=indent) for c in cs)
+    if not isvoid: res += f'{sp}{cltag}{nl}'
     return res
 
 FT.__html__ = to_xml

nbs/11_xml.ipynb

@@ -198,7 +198,7 @@
       "  (['head', (['title', ('Some page',), {}],), {}],\n",
       "   ['body',\n",
       "    (['div',\n",
-      "      ('Some text',\n",
+      "      ('Some text\\nanother line',\n",
       "       ['input', (), {'name': 'me'}],\n",
       "       ['img', (), {'data': 1, 'src': 'filename'}]),\n",
       "      {'class': 'myclass another', 'style': 'padding:1; margin:2'}],),\n",
@@ -210,7 +210,7 @@
    "source": [
     "samp = Html(\n",
     "    Head(Title('Some page')),\n",
-    "    Body(Div('Some text', Input(name='me'), Img(src=\"filename\", data=1),\n",
+    "    Body(Div('Some text\\nanother line', Input(name='me'), Img(src=\"filename\", data=1),\n",
     "             cls=['myclass', 'another'],\n",
     "             style={'padding':1, 'margin':2}))\n",
     ")\n",
@@ -325,14 +325,15 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def to_xml(elm, lvl=0):\n",
+    "def to_xml(elm, lvl=0, indent:bool=True):\n",
     "    \"Convert `ft` element tree into an XML string\"\n",
+    "    nl = '\\n'\n",
+    "    if not indent: lvl,nl = 0,''\n",
     "    if elm is None: return ''\n",
-    "    if isinstance(elm, tuple): return '\\n'.join(to_xml(o) for o in elm)\n",
+    "    if isinstance(elm, tuple): return f'{nl}'.join(to_xml(o, indent=indent) for o in elm)\n",
     "    if hasattr(elm, '__ft__'): elm = elm.__ft__()\n",
-    "    if isinstance(elm, bytes): return elm.decode('utf-8')\n",
     "    sp = ' ' * lvl\n",
-    "    if not isinstance(elm, list): return f'{_escape(elm)}\\n'\n",
+    "    if not isinstance(elm, list): return f'{_escape(elm)}{nl}'\n",
     "\n",
     "    tag,cs,attrs = elm\n",
     "    stag = tag\n",
@@ -342,12 +343,12 @@
     "\n",
     "    isvoid = getattr(elm, 'void_', False)\n",
     "    cltag = '' if isvoid else f'</{tag}>'\n",
-    "    if not cs: return f'{sp}<{stag}>{cltag}\\n'\n",
+    "    if not cs: return f'{sp}<{stag}>{cltag}{nl}'\n",
     "    if len(cs)==1 and not isinstance(cs[0],(list,tuple)) and not hasattr(cs[0],'__ft__'):\n",
-    "        return f'{sp}<{stag}>{_escape(cs[0])}{cltag}\\n'\n",
-    "    res = f'{sp}<{stag}>\\n'\n",
-    "    res += ''.join(to_xml(c, lvl=lvl+2) for c in cs)\n",
-    "    if not isvoid: res += f'{sp}{cltag}\\n'\n",
+    "        return f'{sp}<{stag}>{_escape(cs[0])}{cltag}{nl}'\n",
+    "    res = f'{sp}<{stag}>{nl}'\n",
+    "    res += ''.join(to_xml(c, lvl=lvl+2, indent=indent) for c in cs)\n",
+    "    if not isvoid: res += f'{sp}{cltag}{nl}'\n",
     "    return res\n",
     "\n",
     "FT.__html__ = to_xml"
@@ -372,6 +373,7 @@
       "  <body>\n",
       "    <div class=\"myclass another\" style=\"padding:1; margin:2\">\n",
       "Some text\n",
+      "another line\n",
       "      <input name=\"me\">\n",
       "      <img src=\"filename\" data=\"1\">\n",
       "    </div>\n",
@@ -386,6 +388,26 @@
     "print(h)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "51e58821",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "<!doctype html><html><head><title>Some page</title></head><body><div class=\"myclass another\" style=\"padding:1; margin:2\">Some text\n",
+      "another line<input name=\"me\"><img src=\"filename\" data=\"1\"></div></body></html>\n"
+     ]
+    }
+   ],
+   "source": [
+    "h = to_xml(samp, indent=False)\n",
+    "print(h)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "4713bd8d",
@@ -421,7 +443,6 @@
     "\n",
     "r = _SafeString('<b>Hello from Django</b>')\n",
     "print(to_xml(Div(r)))\n",
-    "\n",
     "print(_escape(Div(P('Hello from fastcore <3'))))"
    ]
   },