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/rest/client/v1 | |
| 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/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 34df5be4e9..88ca5184cd 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -23,7 +23,8 @@ from synapse.util.msisdn import phone_number_to_msisdn from .base import ClientV1RestServlet, client_path_patterns -import simplejson as json +from canonicaljson import json + import urllib from six.moves.urllib import parse as urlparse diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 0b984987ed..e6ae5db79b 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -31,7 +31,7 @@ from synapse.http.servlet import ( from six.moves.urllib import parse as urlparse import logging -import simplejson as json +from canonicaljson import json logger = logging.getLogger(__name__) |