unix-ffi/json: Accept both str and bytes as arg for json.loads().

asdil12 · dpgeorge · commit d1a74360a20d · 2025-04-10T22:46:28.000+10:00
Same as micropython's internal json lib does. Fixes micropython#985. Signed-off-by: Dominik Heidler <dheidler@suse.de>
diff --git a/unix-ffi/json/json/__init__.py b/unix-ffi/json/json/__init__.py
@@ -354,8 +354,8 @@ def loads(
     object_pairs_hook=None,
     **kw
 ):
-    """Deserialize ``s`` (a ``str`` instance containing a JSON
-    document) to a Python object.
+    """Deserialize ``s`` (a ``str``, ``bytes`` or ``bytearray`` instance
+    containing a JSON document) to a Python object.
 
     ``object_hook`` is an optional function that will be called with the
     result of any object literal decode (a ``dict``). The return value of
@@ -413,4 +413,6 @@ def loads(
         kw["parse_int"] = parse_int
     if parse_constant is not None:
         kw["parse_constant"] = parse_constant
+    if isinstance(s, (bytes, bytearray)):
+        s = s.decode('utf-8')
     return cls(**kw).decode(s)
