summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
committerErik Johnston <erik@matrix.org>2018-03-15 23:38:43 +0000
commit6affde172cfeb89b6307a065ff960214156a9373 (patch)
tree69ce22863cdf788689a4bb6c1a869ff4010f2b33 /synapse/http
parentFix log message in purge_history (diff)
downloadsynapse-erikj/fix_things.tar.xz
Replace some ujson with simplejson to make it work github/erikj/fix_things erikj/fix_things
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py

index 165c684d0d..b19e578844 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py
@@ -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,