Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace some ujson with simplejson to make it work

Browse Source
This commit is contained in:
Erik Johnston 2018-03-15 23:38:43 +00:00 committed by Matthew Hodgson
parent 3bc5bd2d22
commit bf49d2dca8
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/http/server.py
View File

@ -38,6 +38,7 @@ import collections
import logging import logging
import urllib import urllib
import ujson import ujson
import simplejson
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -462,7 +463,7 @@ def respond_with_json(request, code, json_object, send_cors=False,
json_bytes = encode_canonical_json(json_object) json_bytes = encode_canonical_json(json_object)
else: else:
# ujson doesn't like frozen_dicts. # ujson doesn't like frozen_dicts.
json_bytes = ujson.dumps(json_object, ensure_ascii=False) json_bytes = simplejson.dumps(json_object)
return respond_with_json_bytes( return respond_with_json_bytes(
request, code, json_bytes, request, code, json_bytes,

2
synapse/rest/client/v2_alpha/sync.py
View File

@ -33,7 +33,7 @@ from ._base import set_timeline_upper_limit
import itertools import itertools
import logging import logging
import ujson as json import simplejson as json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
synapse/storage/events.py
View File

@ -38,7 +38,7 @@ from functools import wraps
import synapse.metrics import synapse.metrics
import logging import logging
import ujson as json import simplejson as json
# these are only included to make the type annotations work # these are only included to make the type annotations work
from synapse.events import EventBase # noqa: F401 from synapse.events import EventBase # noqa: F401

2
synapse/storage/events_worker.py
View File

@ -28,7 +28,7 @@ from synapse.api.errors import SynapseError
from collections import namedtuple from collections import namedtuple
import logging import logging
import ujson as json import simplejson as json
# these are only included to make the type annotations work # these are only included to make the type annotations work
from synapse.events import EventBase # noqa: F401 from synapse.events import EventBase # noqa: F401