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/matrixfederationclient.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 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4e0399e762..2cb9e3e231 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -27,7 +27,7 @@ from synapse.util import logcontext from synapse.util.logcontext import make_deferred_yieldable import synapse.util.retryutils -from canonicaljson import encode_canonical_json +from canonicaljson import encode_canonical_json, json from synapse.api.errors import ( SynapseError, Codes, HttpResponseException, FederationDeniedError, @@ -36,7 +36,6 @@ from synapse.api.errors import ( from signedjson.sign import sign_json import cgi -import simplejson as json import logging import random import sys |