diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 18:00:10 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 18:00:10 +0000 |
| commit | 610c2ea1314a8aeb0a5c3b8a06f67a4057e25a4c (patch) | |
| tree | 52f9e08ad39ca4bf4fc19ff7d94e3794686a99c7 /synapse/handlers | |
| parent | Merge pull request #20 from matrix-org/http_client_refactor (diff) | |
| download | synapse-610c2ea1314a8aeb0a5c3b8a06f67a4057e25a4c.tar.xz | |
Fix pep8 and pyflakes warnings
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/login.py | 5 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py index 979086a3d6..c98ae2cfb5 100644 --- a/synapse/handlers/login.py +++ b/synapse/handlers/login.py @@ -23,7 +23,6 @@ import synapse.util.emailutils as emailutils import bcrypt import logging -import urllib logger = logging.getLogger(__name__) @@ -101,7 +100,9 @@ class LoginHandler(BaseHandler): data = yield httpCli.get_json( # TODO FIXME This should be configurable. # XXX: ID servers need to use HTTPS - "http://%s%s" % ("matrix.org:8090", "/_matrix/identity/api/v1/lookup"), + "http://%s%s" % ( + "matrix.org:8090", "/_matrix/identity/api/v1/lookup" + ), { 'medium': 'email', 'address': email diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 277616ea69..48c326ebf0 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -168,7 +168,10 @@ class RegistrationHandler(BaseHandler): defer.returnValue(None) data = yield httpCli.get_json( # XXX: This should be HTTPS - "http://%s%s" % (creds['idServer'], "/_matrix/identity/api/v1/3pid/getValidated3pid"), + "http://%s%s" % ( + creds['idServer'], + "/_matrix/identity/api/v1/3pid/getValidated3pid" + ), {'sid': creds['sid'], 'clientSecret': creds['clientSecret']} ) @@ -183,7 +186,9 @@ class RegistrationHandler(BaseHandler): httpCli = SimpleHttpClient(self.hs) data = yield httpCli.post_urlencoded_get_json( # XXX: Change when ID servers are all HTTPS - "http://%s%s" % (creds['idServer'], "/_matrix/identity/api/v1/3pid/bind"), + "http://%s%s" % ( + creds['idServer'], "/_matrix/identity/api/v1/3pid/bind" + ), { 'sid': creds['sid'], 'clientSecret': creds['clientSecret'], |