Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[util] use minimal separators for 'json_dumps()'

Browse Source
This commit is contained in:
Mike Fährmann 2024-10-01 17:03:13 +02:00
parent ed859f05ed
commit a120295632
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gallery_dl/extractor/instagram.py
View File

@ -14,7 +14,6 @@ from .. import text, util, exception
from ..cache import cache, memcache from ..cache import cache, memcache
import itertools import itertools
import binascii import binascii
import json
import re import re
BASE_PATTERN = r"(?:https?://)?(?:www\.)?instagram\.com" BASE_PATTERN = r"(?:https?://)?(?:www\.)?instagram\.com"
@ -913,7 +912,7 @@ class InstagramGraphqlAPI():
self.user_collection = self.user_saved = self.reels_media = \ self.user_collection = self.user_saved = self.reels_media = \
self.highlights_media = self.guide = self.guide_media = \ self.highlights_media = self.guide = self.guide_media = \
self._unsupported self._unsupported
self._json_dumps = json.JSONEncoder(separators=(",", ":")).encode self._json_dumps = util.json_dumps
api = InstagramRestAPI(extractor) api = InstagramRestAPI(extractor)
self.user_by_name = api.user_by_name self.user_by_name = api.user_by_name

3
gallery_dl/extractor/twitter.py
View File

@ -13,7 +13,6 @@ from .. import text, util, exception
from ..cache import cache, memcache from ..cache import cache, memcache
import itertools import itertools
import random import random
import json
import re import re
BASE_PATTERN = (r"(?:https?://)?(?:www\.|mobile\.)?" BASE_PATTERN = (r"(?:https?://)?(?:www\.|mobile\.)?"
@ -1034,7 +1033,7 @@ class TwitterAPI():
self.root = "https://x.com/i/api" self.root = "https://x.com/i/api"
self._nsfw_warning = True self._nsfw_warning = True
self._json_dumps = json.JSONEncoder(separators=(",", ":")).encode self._json_dumps = util.json_dumps
cookies = extractor.cookies cookies = extractor.cookies
cookies_domain = extractor.cookies_domain cookies_domain = extractor.cookies_domain

6
gallery_dl/util.py
View File

@ -253,7 +253,11 @@ def json_default(obj):
json_loads = json._default_decoder.decode json_loads = json._default_decoder.decode
json_dumps = json.JSONEncoder(default=json_default).encode json_dumps = json.JSONEncoder(
check_circular=False,
separators=(",", ":"),
default=json_default,
).encode
def dump_json(obj, fp=sys.stdout, ensure_ascii=True, indent=4): def dump_json(obj, fp=sys.stdout, ensure_ascii=True, indent=4):

2
test/test_formatter.py
View File

@ -64,7 +64,7 @@ class TestFormatter(unittest.TestCase):
self._run_test("{t!d}", datetime.datetime(2010, 1, 1)) self._run_test("{t!d}", datetime.datetime(2010, 1, 1))
self._run_test("{t!d:%Y-%m-%d}", "2010-01-01") self._run_test("{t!d:%Y-%m-%d}", "2010-01-01")
self._run_test("{dt!T}", "1262304000") self._run_test("{dt!T}", "1262304000")
self._run_test("{l!j}", '["a", "b", "c"]') self._run_test("{l!j}", '["a","b","c"]')
self._run_test("{dt!j}", '"2010-01-01 00:00:00"') self._run_test("{dt!j}", '"2010-01-01 00:00:00"')
self._run_test("{a!g}", "hello-world") self._run_test("{a!g}", "hello-world")
self._run_test("{a!L}", 11) self._run_test("{a!L}", 11)