fixes #804

Author: jph00

fastcore/_modidx.py

@@ -705,7 +705,6 @@
                               'fastcore.xml._escape': ('xml.html#_escape', 'fastcore/xml.py'),
                               'fastcore.xml._fix_k': ('xml.html#_fix_k', 'fastcore/xml.py'),
                               'fastcore.xml._flatten_tuple': ('xml.html#_flatten_tuple', 'fastcore/xml.py'),
-                              'fastcore.xml._is_whitespace_significant': ('xml.html#_is_whitespace_significant', 'fastcore/xml.py'),
                               'fastcore.xml._noescape': ('xml.html#_noescape', '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.py

@@ -15,7 +15,7 @@
 # %% ../nbs/09_xml.ipynb #f6c9a7f5
 from .utils import *
 
-import types,json
+import types,json,re
 
 from dataclasses import dataclass, asdict
 from typing import Mapping
@@ -146,7 +146,7 @@ def _to_attr(k,v):
     if isinstance(v,bool):
         if v==True : return str(k)
         if v==False: return ''
-    if isinstance(v,str): v = escape(v, quote=False)
+    if isinstance(v,str) and ('&' in v or '<' in v or '>' in v): v = escape(v, quote=False)
     elif isinstance(v, Mapping): v = json.dumps(v)
     elif hasattr(v, '__html__'): v = v.__html__()
     else: v = str(v)
@@ -164,25 +164,22 @@ def _to_attr(k,v):
 _inline_tags = {'a', 'span', 'b', 'i', 'u', 'em', 'strong', 'img', 'br', 'small',
                 'big', 'sub', 'sup', 'label', 'input', 'select', 'option'}
 
-def _is_whitespace_significant(elm):
-    return elm.tag in {'pre', 'code', 'textarea', 'script'} or elm.get('contenteditable') == 'true'
+_ws_significant = {'pre', 'code', 'textarea', 'script'}
 
-# %% ../nbs/09_xml.ipynb #a1ed9c01
+# %% ../nbs/09_xml.ipynb #db55801a
 def _to_xml(elm, lvl=0, indent=True, do_escape=True):
     "Convert `FT` element tree into an XML string"
     esc_fn = _escape if do_escape else _noescape
     if elm is None: return ''
     if hasattr(elm, '__ft__'): elm = elm.__ft__()
-    if isinstance(elm, tuple):
-        return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)
+    if isinstance(elm, tuple): return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)
     if isinstance(elm, bytes): return elm.decode('utf-8')
     if not isinstance(elm, FT): return f'{esc_fn(elm)}'
 
-    tag, cs, attrs = elm.list
-    is_void = getattr(elm, 'void_', False)
+    tag,cs,attrs = elm.tag,elm.children,elm.attrs
+    is_void = elm.void_
     is_block = tag in _block_tags
-    if _is_whitespace_significant(elm): indent = False
-
+    if indent and (tag in _ws_significant or attrs.get('contenteditable') == 'true'): indent = False
     sp,nl = (' ' * lvl,'\n') if indent and is_block else ('','')
     nl_end = nl
 
@@ -202,12 +199,11 @@ def _to_xml(elm, lvl=0, indent=True, do_escape=True):
         return f'{sp}{stag_}{content}{cltag}{nl_end}'
 
     res = f'{sp}{stag_}{nl}'
-    for c in cs:
-        res += _to_xml(c, lvl=lvl+2 if indent else 0, indent=indent, do_escape=do_escape)
+    for c in cs: res += _to_xml(c, lvl=lvl+2 if indent else 0, indent=indent, do_escape=do_escape)
     if not is_void: res += f'{sp}{cltag}{nl_end}'
     return Safe(res)
 
-# %% ../nbs/09_xml.ipynb #7a3655e9
+# %% ../nbs/09_xml.ipynb #e24ad4e0
 def to_xml(*elms, lvl=0, indent=True, do_escape=True):
     "Convert `ft` element tree into an XML string"
     def _f(elm):
@@ -217,6 +213,7 @@ def _f(elm):
         return elm or ''
     return Safe('\n'.join(map(_f, elms)))
 
+
 # %% ../nbs/09_xml.ipynb #dd054392
 @patch
 def __html__(self:FT): return to_xml(self, indent=False)

nbs/09_xml.ipynb

@@ -30,7 +30,7 @@
     "#| export\n",
     "from fastcore.utils import *\n",
     "\n",
-    "import types,json\n",
+    "import types,json,re\n",
     "\n",
     "from dataclasses import dataclass, asdict\n",
     "from typing import Mapping\n",
@@ -326,7 +326,9 @@
       ]
      },
      "execution_count": null,
-     "metadata": {},
+     "metadata": {
+      "__type": "FT"
+     },
      "output_type": "execute_result"
     }
    ],
@@ -382,7 +384,7 @@
     "    if isinstance(v,bool):\n",
     "        if v==True : return str(k)\n",
     "        if v==False: return ''\n",
-    "    if isinstance(v,str): v = escape(v, quote=False)\n",
+    "    if isinstance(v,str) and ('&' in v or '<' in v or '>' in v): v = escape(v, quote=False)\n",
     "    elif isinstance(v, Mapping): v = json.dumps(v)\n",
     "    elif hasattr(v, '__html__'): v = v.__html__()\n",
     "    else: v = str(v)\n",
@@ -408,14 +410,13 @@
     "_inline_tags = {'a', 'span', 'b', 'i', 'u', 'em', 'strong', 'img', 'br', 'small',\n",
     "                'big', 'sub', 'sup', 'label', 'input', 'select', 'option'}\n",
     "\n",
-    "def _is_whitespace_significant(elm):\n",
-    "    return elm.tag in {'pre', 'code', 'textarea', 'script'} or elm.get('contenteditable') == 'true'"
+    "_ws_significant = {'pre', 'code', 'textarea', 'script'}"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a1ed9c01",
+   "id": "db55801a",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -425,16 +426,14 @@
     "    esc_fn = _escape if do_escape else _noescape\n",
     "    if elm is None: return ''\n",
     "    if hasattr(elm, '__ft__'): elm = elm.__ft__()\n",
-    "    if isinstance(elm, tuple):\n",
-    "        return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)\n",
+    "    if isinstance(elm, tuple): return ''.join(_to_xml(o, lvl=lvl, indent=indent, do_escape=do_escape) for o in elm)\n",
     "    if isinstance(elm, bytes): return elm.decode('utf-8')\n",
     "    if not isinstance(elm, FT): return f'{esc_fn(elm)}'\n",
     "\n",
-    "    tag, cs, attrs = elm.list\n",
-    "    is_void = getattr(elm, 'void_', False)\n",
+    "    tag,cs,attrs = elm.tag,elm.children,elm.attrs\n",
+    "    is_void = elm.void_\n",
     "    is_block = tag in _block_tags\n",
-    "    if _is_whitespace_significant(elm): indent = False\n",
-    "\n",
+    "    if indent and (tag in _ws_significant or attrs.get('contenteditable') == 'true'): indent = False\n",
     "    sp,nl = (' ' * lvl,'\\n') if indent and is_block else ('','')\n",
     "    nl_end = nl\n",
     "\n",
@@ -454,16 +453,15 @@
     "        return f'{sp}{stag_}{content}{cltag}{nl_end}'\n",
     "\n",
     "    res = f'{sp}{stag_}{nl}'\n",
-    "    for c in cs:\n",
-    "        res += _to_xml(c, lvl=lvl+2 if indent else 0, indent=indent, do_escape=do_escape)\n",
+    "    for c in cs: res += _to_xml(c, lvl=lvl+2 if indent else 0, indent=indent, do_escape=do_escape)\n",
     "    if not is_void: res += f'{sp}{cltag}{nl_end}'\n",
     "    return Safe(res)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7a3655e9",
+   "id": "e24ad4e0",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -475,7 +473,7 @@
     "            return _to_xml(elm, lvl, indent, do_escape=do_escape)\n",
     "        if isinstance(elm, bytes): return elm.decode('utf-8')\n",
     "        return elm or ''\n",
-    "    return Safe('\\n'.join(map(_f, elms)))"
+    "    return Safe('\\n'.join(map(_f, elms)))\n"
    ]
   },
   {
@@ -542,7 +540,9 @@
       ]
      },
      "execution_count": null,
-     "metadata": {},
+     "metadata": {
+      "__type": "Safe"
+     },
      "output_type": "execute_result"
     }
    ],
@@ -652,7 +652,9 @@
       ]
      },
      "execution_count": null,
-     "metadata": {},
+     "metadata": {
+      "__type": "FT"
+     },
      "output_type": "execute_result"
     }
    ],
@@ -993,7 +995,9 @@
       ]
      },
      "execution_count": null,
-     "metadata": {},
+     "metadata": {
+      "__type": "Markdown"
+     },
      "output_type": "execute_result"
     }
    ],
@@ -1044,7 +1048,10 @@
    ]
   }
  ],
- "metadata": {},
+ "metadata": {
+  "solveit_dialog_mode": "concise",
+  "solveit_ver": 2
+ },
  "nbformat": 4,
  "nbformat_minor": 5
 }