diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index cb5e1e80ac..5c72635915 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -42,8 +42,8 @@ class IdentityHandler(BaseHandler):
# each request
http_client = SimpleHttpClient(self.hs)
# XXX: make this configurable!
- trustedIdServers = ['matrix.org', 'localhost:8090']
- #trustedIdServers = ['matrix.org']
+ # trustedIdServers = ['matrix.org', 'localhost:8090']
+ trustedIdServers = ['matrix.org']
if not creds['idServer'] in trustedIdServers:
logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
'credentials', creds['idServer'])
@@ -86,4 +86,4 @@ class IdentityHandler(BaseHandler):
logger.debug("bound threepid %r to %s", creds, mxid)
except CodeMessageException as e:
data = json.loads(e.msg)
- defer.returnValue(data)
\ No newline at end of file
+ defer.returnValue(data)
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py
index 5c39356d71..f7f3698340 100644
--- a/synapse/handlers/login.py
+++ b/synapse/handlers/login.py
@@ -80,4 +80,4 @@ class LoginHandler(BaseHandler):
yield self.store.user_add_threepid(
user_id, medium, address, validated_at,
self.hs.get_clock().time_msec()
- )
\ No newline at end of file
+ )
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index d4483c3a1d..7b68585a17 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -18,18 +18,15 @@ from twisted.internet import defer
from synapse.types import UserID
from synapse.api.errors import (
- AuthError, Codes, SynapseError, RegistrationError, InvalidCaptchaError,
- CodeMessageException
+ AuthError, Codes, SynapseError, RegistrationError, InvalidCaptchaError
)
from ._base import BaseHandler
import synapse.util.stringutils as stringutils
from synapse.util.async import run_on_reactor
-from synapse.http.client import SimpleHttpClient
from synapse.http.client import CaptchaServerHttpClient
import base64
import bcrypt
-import json
import logging
import urllib
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 4bc01f3cc2..8f62e5c6f2 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -185,4 +185,4 @@ class RegistrationStore(SQLBaseStore):
}, {
"validated_at": validated_at,
"added_at": added_at,
- })
\ No newline at end of file
+ })
|
