diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-03-29 22:45:52 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-03-29 22:45:52 +0100 |
commit | fcfe7f6ad3a2a9c285ac96008395fc47e096ff4b (patch) | |
tree | c85be32a5201155f56672379a43a5cf10bd53c8e /synapse/handlers | |
parent | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creation (diff) | |
download | synapse-fcfe7f6ad3a2a9c285ac96008395fc47e096ff4b.tar.xz |
Use simplejson throughout
Let's use simplejson rather than json, for consistency.
Diffstat (limited to 'synapse/handlers')
-rw-r--r-- | synapse/handlers/identity.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 9efcdff1d6..91a0898860 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -15,6 +15,11 @@ # limitations under the License. """Utilities for interacting with Identity Servers""" + +import logging + +import simplejson as json + from twisted.internet import defer from synapse.api.errors import ( @@ -24,9 +29,6 @@ from ._base import BaseHandler from synapse.util.async import run_on_reactor from synapse.api.errors import SynapseError, Codes -import json -import logging - logger = logging.getLogger(__name__) |