ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-20 11:38:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-04-21 10:09:03 -04:00
parent bc9e4ac728
commit 6e8dde3b14
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/allmydata/util/jsonbytes.py
View File

@ -27,16 +27,18 @@ if PY2:
codecs.register_error("backslashreplace_tahoe_py2", backslashreplace_py2) codecs.register_error("backslashreplace_tahoe_py2", backslashreplace_py2)
def _make_bytes_to_unicode(any_bytes):
def _bytes_to_unicode(any_bytes, obj):
"""Create a function that recursively converts bytes to unicode. """Create a function that recursively converts bytes to unicode.
:param any_bytes: If True, also support non-UTF-8-encoded bytes. :param any_bytes: If True, also support non-UTF-8-encoded bytes.
:param obj: Object to de-byte-ify.
""" """
errors = "backslashreplace" if any_bytes else "strict" errors = "backslashreplace" if any_bytes else "strict"
if PY2 and errors == "backslashreplace": if PY2 and errors == "backslashreplace":
errors = "backslashreplace_tahoe_py2" errors = "backslashreplace_tahoe_py2"
def _bytes_to_unicode(obj): def doit(obj):
"""Convert any bytes objects to unicode, recursively.""" """Convert any bytes objects to unicode, recursively."""
if isinstance(obj, bytes): if isinstance(obj, bytes):
return obj.decode("utf-8", errors=errors) return obj.decode("utf-8", errors=errors)
@ -45,14 +47,14 @@ def _make_bytes_to_unicode(any_bytes):
for k, v in obj.items(): for k, v in obj.items():
if isinstance(k, bytes): if isinstance(k, bytes):
k = k.decode("utf-8", errors=errors) k = k.decode("utf-8", errors=errors)
v = _bytes_to_unicode(v) v = doit(v)
new_obj[k] = v new_obj[k] = v
return new_obj return new_obj
if isinstance(obj, (list, set, tuple)): if isinstance(obj, (list, set, tuple)):
return [_bytes_to_unicode(i) for i in obj] return [doit(i) for i in obj]
return obj return obj
return _bytes_to_unicode return doit(obj)
class UTF8BytesJSONEncoder(json.JSONEncoder): class UTF8BytesJSONEncoder(json.JSONEncoder):
@ -61,7 +63,7 @@ class UTF8BytesJSONEncoder(json.JSONEncoder):
""" """
def iterencode(self, o, **kwargs): def iterencode(self, o, **kwargs):
return json.JSONEncoder.iterencode( return json.JSONEncoder.iterencode(
self, _make_bytes_to_unicode(False)(o), **kwargs) self, _bytes_to_unicode(False, o), **kwargs)
class AnyBytesJSONEncoder(json.JSONEncoder): class AnyBytesJSONEncoder(json.JSONEncoder):
@ -73,7 +75,7 @@ class AnyBytesJSONEncoder(json.JSONEncoder):
""" """
def iterencode(self, o, **kwargs): def iterencode(self, o, **kwargs):
return json.JSONEncoder.iterencode( return json.JSONEncoder.iterencode(
self, _make_bytes_to_unicode(True)(o), **kwargs) self, _bytes_to_unicode(True, o), **kwargs)
def dumps(obj, *args, **kwargs): def dumps(obj, *args, **kwargs):