fixes #604

Author: jph00

fastcore/basics.py

@@ -818,7 +818,7 @@ def __new__(cls, x=None, *rest):
                 try: x = tuple(iter(x))
                 except TypeError: x = (x,)
         return super().__new__(cls, x+rest if rest else x)
-
+    
     def _op(self,op,*args):
         if not isinstance(self,fastuple): self = fastuple(self)
         return type(self)(map(op,self,*map(cycle, args)))

fastcore/xml.py

@@ -105,11 +105,13 @@ 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=True)
+    if isinstance(v,str): v = escape(v, quote=False)
     elif isinstance(v, Mapping): v = json.dumps(v)
     else: v = str(v)
     qt = '"'
-    if qt in v: qt = "'"
+    if qt in v:
+        qt = "'"
+        if "'" in v: v = v.replace("'", "'")
     return f'{k}={qt}{v}{qt}'
 
 # %% ../nbs/11_xml.ipynb

nbs/01_basics.ipynb

@@ -594,7 +594,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L101){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L102){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "### get_class\n",
        "\n",
@@ -606,7 +606,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L101){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L102){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "### get_class\n",
        "\n",
@@ -784,7 +784,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L145){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L146){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### ignore_exceptions\n",
        "\n",
@@ -795,7 +795,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L145){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L146){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### ignore_exceptions\n",
        "\n",
@@ -2777,7 +2777,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L496){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L501){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### GetAttr\n",
        "\n",
@@ -2788,7 +2788,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L496){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L501){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### GetAttr\n",
        "\n",
@@ -4286,7 +4286,7 @@
     "                try: x = tuple(iter(x))\n",
     "                except TypeError: x = (x,)\n",
     "        return super().__new__(cls, x+rest if rest else x)\n",
-    "\n",
+    "    \n",
     "    def _op(self,op,*args):\n",
     "        if not isinstance(self,fastuple): self = fastuple(self)\n",
     "        return type(self)(map(op,self,*map(cycle, args)))\n",

nbs/11_xml.ipynb

@@ -229,7 +229,7 @@
       "   ['body',\n",
       "    (['div',\n",
       "      ('Some text\\nanother line',\n",
-      "       ['input', (), {'name': 'me'}],\n",
+      "       ['input', (), {'name': \"jph's\"}],\n",
       "       ['img', (), {'data': 1, 'src': 'filename'}]),\n",
       "      {'class': 'myclass another', 'style': 'padding:1; margin:2'}],),\n",
       "    {}]),\n",
@@ -240,7 +240,7 @@
    "source": [
     "samp = Html(\n",
     "    Head(Title('Some page')),\n",
-    "    Body(Div('Some text\\nanother line', Input(name='me'), Img(src=\"filename\", data=1),\n",
+    "    Body(Div('Some text\\nanother line', Input(name=\"jph's\"), Img(src=\"filename\", data=1),\n",
     "             cls=['myclass', 'another'],\n",
     "             style={'padding':1, 'margin':2}))\n",
     ")\n",
@@ -351,11 +351,13 @@
     "    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=True)\n",
+    "    if isinstance(v,str): v = escape(v, quote=False)\n",
     "    elif isinstance(v, Mapping): v = json.dumps(v)\n",
     "    else: v = str(v)\n",
     "    qt = '\"'\n",
-    "    if qt in v: qt = \"'\"\n",
+    "    if qt in v:\n",
+    "        qt = \"'\"\n",
+    "        if \"'\" in v: v = v.replace(\"'\", \"'\")\n",
     "    return f'{k}={qt}{v}{qt}'"
    ]
   },
@@ -420,7 +422,7 @@
       "    <div class=\"myclass another\" style=\"padding:1; margin:2\">\n",
       "Some text\n",
       "another line\n",
-      "      <input name=\"me\">\n",
+      "      <input name=\"jph's\">\n",
       "      <img src=\"filename\" data=\"1\">\n",
       "    </div>\n",
       "  </body>\n",
@@ -469,7 +471,7 @@
      "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"
+      "another line<input name=\"jph's\"><img src=\"filename\" data=\"1\"></div></body></html>\n"
      ]
     }
    ],