Added json to enhanced preimports

Author: dhondta

docs/pages/enhancements.md

@@ -89,6 +89,14 @@ A context manager is also available:
 
 -----
 
+## `json`
+    
+`json`, while imported with Tinyscript, is enhanced with an additional convenience function, that is:
+
+- `loadc`: this loads a JSON that has comments (starting with `#`) so that it does not fail when loading with `json` while annotated.
+
+-----
+
 ## `logging`
 
 `logging` is slightly enhanced with a few things:

src/tinyscript/VERSION.txt

@@ -1 +1 @@
-1.30.10
+1.30.11

src/tinyscript/preimports/__init__.py

@@ -18,6 +18,7 @@
         'hashlib':    "hash",
         'inspect':    "inspectp",
         'itertools':  "itools",
+        'json':       "jsonp",
         'logging':    "log",
         'random':     "rand",
         're':         "regex",
@@ -35,7 +36,6 @@
         "configparser",
         "ctypes",
         "fileinput",
-        "json",
         "os",
         "platform",
         "shlex",

src/tinyscript/preimports/jsonp.py

@@ -0,0 +1,17 @@
+# -*- coding: UTF-8 -*-
+"""Module for enhancing json preimport.
+
+"""
+import json
+
+
+def loadc(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None,
+          **kw):
+    """ Deserialize ``fp``  (a ``.read()``-supporting file-like object containing a JSON document with comments) to a
+         Python object. """
+    _b = lambda s: s.encode() if 'b' in fp.mode else s
+    s = _b("\n").join(l.strip().split(_b("#"), 1)[0].strip() for l in fp.readlines())
+    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)
+json.loadc = loadc
+

tests/test_preimports_json.py

@@ -0,0 +1,34 @@
+# -*- coding: UTF-8 -*-
+"""Preimports string assets' tests.
+
+"""
+from tinyscript.preimports import json
+
+from utils import *
+
+
+FNAME = ".test.json"
+TEST_JSON = """
+# test comment 1
+{
+    "test": ["a", "b", "c"],
+    "other": 1 # test comment 2
+}
+"""
+
+
+class TestPreimportsJson(TestCase):
+    @classmethod
+    def tearDownClass(cls):
+        remove(FNAME)
+    
+    def test_commented_json_loading(self):
+        with open(FNAME, 'wt') as f:
+            f.write(TEST_JSON)
+        with open(FNAME) as f:
+            self.assertIsNotNone(json.loadc(f))
+        with open(FNAME, 'wb') as f:
+            f.write(TEST_JSON.encode())
+        with open(FNAME, 'rb') as f:
+            self.assertIsNotNone(json.loadc(f))
+