diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
| commit | 88964b987e1d80d2dc9e81fc3ebc51afd9defbe1 (patch) | |
| tree | c98c28e51a8d52a8878cf2d888a4a110a835d8a8 /synapse/api | |
| parent | Document the additional routes for the event_creator worker (diff) | |
| parent | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check (diff) | |
| download | synapse-88964b987e1d80d2dc9e81fc3ebc51afd9defbe1.tar.xz | |
Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/errors.py | 3 | ||||
| -rw-r--r-- | synapse/api/filtering.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index aa15f73f36..bee59e80dd 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -15,9 +15,10 @@ """Contains exceptions and error codes.""" -import json import logging +import simplejson as json + logger = logging.getLogger(__name__) diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 83206348e5..db43219d24 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -17,7 +17,7 @@ from synapse.storage.presence import UserPresenceState from synapse.types import UserID, RoomID from twisted.internet import defer -import ujson as json +import simplejson as json import jsonschema from jsonschema import FormatChecker |