summary refs log tree commit diff
path: root/synapse/handlers/identity.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-11 10:59:00 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-11 10:59:00 +0100
commit427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch)
tree608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/handlers/identity.py
parentUpdate README.rst (diff)
parentbump version/changelog (diff)
downloadsynapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
Diffstat (limited to 'synapse/handlers/identity.py')
-rw-r--r--synapse/handlers/identity.py8
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__)