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
committerMatthew Hodgson <matthew@matrix.org>2018-03-16 00:55:44 +0000
commitbf49d2dca8db6d82f09441a35cd3655c746b6b4d (patch)
treeff8c9a6666ec5810aa42ce08f2e2535809288079 /synapse/http
parentmake incr syncs work (diff)
downloadsynapse-bf49d2dca8db6d82f09441a35cd3655c746b6b4d.tar.xz
Replace some ujson with simplejson to make it work
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 4b567215c8..3c7a0ef97a 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -38,6 +38,7 @@ import collections
 import logging
 import urllib
 import ujson
+import simplejson
 
 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)
         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,