summaryrefslogtreecommitdiffstats
path: root/gallery_dl/util.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2023-11-04 18:45:48 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2023-11-04 18:45:48 -0400
commit7997fa94c82f9a6db63421c0af433f325a8aa607 (patch)
tree25e8377f1d038f8dad93e2c54c12beacbc65f470 /gallery_dl/util.py
parente052f3b9e1d9703a5a466daeaf37bacf476c2daf (diff)
New upstream version 1.26.2.upstream/1.26.2
Diffstat (limited to 'gallery_dl/util.py')
-rw-r--r--gallery_dl/util.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/gallery_dl/util.py b/gallery_dl/util.py
index 62e7b4a..6255d49 100644
--- a/gallery_dl/util.py
+++ b/gallery_dl/util.py
@@ -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")