fixes #432

Author: jph00

fastcore/_nbdev.py

@@ -157,6 +157,7 @@
          "bunzip": "03_xtras.ipynb",
          "loads": "03_xtras.ipynb",
          "loads_multi": "03_xtras.ipynb",
+         "dumps": "03_xtras.ipynb",
          "untar_dir": "03_xtras.ipynb",
          "repo_details": "03_xtras.ipynb",
          "run": "03_xtras.ipynb",

fastcore/xtras.py

@@ -4,7 +4,7 @@
 from __future__ import annotations
 
 
-__all__ = ['walk', 'globtastic', 'maybe_open', 'image_size', 'bunzip', 'loads', 'loads_multi', 'untar_dir',
+__all__ = ['walk', 'globtastic', 'maybe_open', 'image_size', 'bunzip', 'loads', 'loads_multi', 'dumps', 'untar_dir',
            'repo_details', 'run', 'open_file', 'save_pickle', 'load_pickle', 'dict2obj', 'obj2dict', 'repr_dict',
            'is_listy', 'mapped', 'IterLen', 'ReindexCollection', 'get_source_link', 'truncstr', 'spark_chars',
            'sparkline', 'modify_exception', 'round_multiple', 'str2bool', 'set_num_threads', 'join_path_file',
@@ -113,13 +113,12 @@ def bunzip(fn):
         for d in iter(lambda: src.read(1024*1024), b''): dst.write(d)
 
 # Cell
-def loads(s, cls=None, object_hook=None, parse_float=None,
-          parse_int=None, parse_constant=None, object_pairs_hook=None, **kw):
+def loads(s, **kw):
     "Same as `json.loads`, but handles `None`"
     if not s: return {}
-    import json
-    return json.loads(s, cls=cls, object_hook=object_hook, parse_float=parse_float,
-          parse_int=parse_int, parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)
+    try: import ujson as json
+    except ModuleNotFoundError: import json
+    return json.loads(s, **kw)
 
 # Cell
 def loads_multi(s:str):
@@ -133,6 +132,14 @@ def loads_multi(s:str):
         yield obj
         s = s[pos:]
 
+# Cell
+def dumps(obj, **kw):
+    "Same as `json.dumps`, but uses `ujson` if available"
+    try: import ujson as json
+    except ModuleNotFoundError: import json
+    else: kw['escape_forward_slashes']=False
+    return json.dumps(obj, **kw)
+
 # Cell
 def _unpack(fname, out):
     import shutil

nbs/03_xtras.ipynb

@@ -398,13 +398,12 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def loads(s, cls=None, object_hook=None, parse_float=None,\n",
-    "          parse_int=None, parse_constant=None, object_pairs_hook=None, **kw):\n",
+    "def loads(s, **kw):\n",
     "    \"Same as `json.loads`, but handles `None`\"\n",
     "    if not s: return {}\n",
-    "    import json\n",
-    "    return json.loads(s, cls=cls, object_hook=object_hook, parse_float=parse_float,\n",
-    "          parse_int=parse_int, parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw)"
+    "    try: import ujson as json\n",
+    "    except ModuleNotFoundError: import json\n",
+    "    return json.loads(s, **kw)"
    ]
   },
   {
@@ -444,6 +443,21 @@
     "test_eq(list(loads_multi(tst)), [{'a': 1}, {'b': 2}])"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def dumps(obj, **kw):\n",
+    "    \"Same as `json.dumps`, but uses `ujson` if available\"\n",
+    "    try: import ujson as json\n",
+    "    except ModuleNotFoundError: import json\n",
+    "    else: kw['escape_forward_slashes']=False\n",
+    "    return json.dumps(obj, **kw)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1496,7 +1510,7 @@
     {
      "data": {
       "text/plain": [
-       "['e', 'c', 'f', 'h', 'a', 'g', 'd', 'b']"
+       "['h', 'b', 'e', 'g', 'a', 'd', 'f', 'c']"
       ]
      },
      "execution_count": null,
@@ -2006,8 +2020,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Num Events: 7, Freq/sec: 333.8\n",
-      "Most recent:  ▅▂▅▇▁ 318.4 288.8 312.8 352.0 246.1\n"
+      "Num Events: 7, Freq/sec: 315.8\n",
+      "Most recent:  ▇▁▁▂▅ 423.6 331.5 332.6 361.3 399.7\n"
      ]
     }
    ],