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/federation | |
| 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 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index d4dd967c60..a00420a24b 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -15,7 +15,7 @@ # limitations under the License. import logging -import simplejson as json +from canonicaljson import json from twisted.internet import defer from synapse.api.errors import AuthError, FederationError, SynapseError, NotFoundError |