diff options
| author | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
| commit | 041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch) | |
| tree | db669225768b3322fe4d63451fdd05799634599a /synapse/handlers/identity.py | |
| parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
| download | synapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/handlers/identity.py')
| -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__) |