diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-28 14:49:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 14:49:57 +0100 |
| commit | 6350bf925e8651f2fae70a1e7eb7182e9161c34a (patch) | |
| tree | 35e766fcb2dabcd1e8978c417709b353d5fdf4bc /synapse/http/server.py | |
| parent | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) (diff) | |
| download | synapse-6350bf925e8651f2fae70a1e7eb7182e9161c34a.tar.xz | |
Attempt to be more performant on PyPy (#3462)
Diffstat (limited to '')
| -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 bc09b8b2be..517aaf7b5a 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -29,7 +29,7 @@ import synapse.metrics import synapse.events from canonicaljson import ( - encode_canonical_json, encode_pretty_printed_json + encode_canonical_json, encode_pretty_printed_json, json ) from twisted.internet import defer @@ -41,7 +41,6 @@ from twisted.web.util import redirectTo import collections import logging import urllib -import simplejson logger = logging.getLogger(__name__) @@ -410,7 +409,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: - json_bytes = simplejson.dumps(json_object) + json_bytes = json.dumps(json_object) return respond_with_json_bytes( request, code, json_bytes, |