diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
| commit | e66fbcbb02d98a0d165f3c5d4642d26add233562 (patch) | |
| tree | 01b5c79c3951f31d5826a852f49aa312d8e47604 /synapse/http/server.py | |
| parent | Update __init__.py (diff) | |
| parent | Merge pull request #3005 from matrix-org/erikj/fix_cache_size (diff) | |
| download | synapse-e66fbcbb02d98a0d165f3c5d4642d26add233562.tar.xz | |
fix merge conflicts
Diffstat (limited to 'synapse/http/server.py')
| -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 4b567215c8..1551db239d 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -37,7 +37,7 @@ from twisted.web.util import redirectTo import collections import logging import urllib -import ujson +import simplejson logger = logging.getLogger(__name__) @@ -461,8 +461,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, |