diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
| commit | 926ba76e23ea9d55638baff541cdfaeb9e01ac47 (patch) | |
| tree | 0fb744087cf47900122e60d5fa4b17765588a6b7 /synapse/http | |
| parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
| download | synapse-926ba76e23ea9d55638baff541cdfaeb9e01ac47.tar.xz | |
Replace ujson with simplejson
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 25466cd292..f1e9002e4d 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -36,7 +36,7 @@ from twisted.web.util import redirectTo import collections import logging import urllib -import ujson +import simplejson logger = logging.getLogger(__name__) @@ -370,8 +370,7 @@ def respond_with_json(request, code, json_object, send_cors=False, if canonical_json or synapse.events.USE_FROZEN_DICTS: 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, |