Compare commits

...

1 Commits

Author SHA1 Message Date
Erik Johnston
6affde172c Replace some ujson with simplejson to make it work 2018-03-15 23:38:43 +00:00
3 changed files with 4 additions and 3 deletions

View File

@@ -37,6 +37,7 @@ import collections
import logging
import urllib
import ujson
import simplejson
logger = logging.getLogger(__name__)
@@ -416,7 +417,7 @@ def respond_with_json(request, code, json_object, send_cors=False,
json_bytes = encode_canonical_json(json_object)
else:
# 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(
request, code, json_bytes,

View File

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

View File

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