summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-29 15:45:44 +0100
committerDavid Baker <dave@matrix.org>2015-04-29 15:45:44 +0100
commit109c8aafd2dadaa0cad6c6e8374ab568a513f335 (patch)
tree1fae2ee5eccfac0e04007f32227690d6008b61b3
parentAccept both camelcase and underscore threepid creds for transition (diff)
downloadsynapse-109c8aafd2dadaa0cad6c6e8374ab568a513f335.tar.xz
Fix includes
-rw-r--r--synapse/handlers/identity.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index a3025bc0db..cbb3184ca5 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -22,6 +22,7 @@ from synapse.api.errors import (
 from ._base import BaseHandler
 from synapse.http.client import SimpleHttpClient
 from synapse.util.async import run_on_reactor
+from synapse.api.errors import SynapseError
 
 import json
 import logging
@@ -59,7 +60,7 @@ class IdentityHandler(BaseHandler):
         else:
             raise SynapseError(400, "No client_secret in creds")
 
-        if not id_server in trustedIdServers:
+        if id_server not in trustedIdServers:
             logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
                         'credentials', id_server)
             defer.returnValue(None)