diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
| commit | 505530f36abba53234c2fa29262a0de87face4fb (patch) | |
| tree | 313bbefb0f7b9693f1189a86410fe3dcdb9207f7 /synapse/handlers/identity.py | |
| parent | Merge branch 'develop' into send_sni_for_federation_requests (diff) | |
| parent | Fix develop because I broke it :( (#3535) (diff) | |
| download | synapse-505530f36abba53234c2fa29262a0de87face4fb.tar.xz | |
Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
# Conflicts: # synapse/crypto/context_factory.py
Diffstat (limited to 'synapse/handlers/identity.py')
| -rw-r--r-- | synapse/handlers/identity.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 277c2b7760..8c8aedb2b8 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -24,10 +24,13 @@ from canonicaljson import json from twisted.internet import defer from synapse.api.errors import ( - MatrixCodeMessageException, CodeMessageException + CodeMessageException, + Codes, + MatrixCodeMessageException, + SynapseError, ) + from ._base import BaseHandler -from synapse.api.errors import SynapseError, Codes logger = logging.getLogger(__name__) |