represent util.NONE as 'null' in JSON output

was '"None"' before
pull/4022/merge
Mike Fährmann 11 months ago
parent 56cd9d408d
commit 72b18d701f
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -206,7 +206,8 @@ class MetadataPP(PostProcessor):
sort_keys=options.get("sort", False),
separators=options.get("separators"),
indent=options.get("indent", indent),
check_circular=False, default=str,
check_circular=False,
default=util.json_default,
)

@ -223,8 +223,14 @@ def datetime_to_timestamp_string(dt):
return ""
def json_default(obj):
if isinstance(obj, CustomNone):
return None
return str(obj)
json_loads = json._default_decoder.decode
json_dumps = json.JSONEncoder(default=str).encode
json_dumps = json.JSONEncoder(default=json_default).encode
def dump_json(obj, fp=sys.stdout, ensure_ascii=True, indent=4):
@ -233,7 +239,7 @@ def dump_json(obj, fp=sys.stdout, ensure_ascii=True, indent=4):
obj, fp,
ensure_ascii=ensure_ascii,
indent=indent,
default=str,
default=json_default,
sort_keys=True,
)
fp.write("\n")

@ -750,6 +750,7 @@ def hash(value):
self.assertIs(obj(), obj)
self.assertIs(obj(1, "a"), obj)
self.assertIs(obj(foo="bar"), obj)
self.assertEqual(util.json_dumps(obj), "null")
i = 0
for _ in obj:

Loading…
Cancel
Save