diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:10:17 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:10:17 +0000 |
commit | 7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95 (patch) | |
tree | 155997683ee2d493e53218a725eb2b85b526fbe9 /synapse/http/client.py | |
parent | SYWEB-112: Use the right user ID when determining invites for display on the ... (diff) | |
download | synapse-7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95.tar.xz |
Fix pep8 warnings
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r-- | synapse/http/client.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 46c90dbb76..c34b086eb9 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -16,7 +16,9 @@ from twisted.internet import defer, reactor from twisted.internet.error import DNSLookupError -from twisted.web.client import _AgentBase, _URI, readBody, FileBodyProducer, PartialDownloadError +from twisted.web.client import ( + _AgentBase, _URI, readBody, FileBodyProducer, PartialDownloadError +) from twisted.web.http_headers import Headers from synapse.http.endpoint import matrix_endpoint @@ -97,7 +99,7 @@ class BaseHttpClient(object): retries_left = 5 - endpoint = self._getEndpoint(reactor, destination); + endpoint = self._getEndpoint(reactor, destination) while True: @@ -181,7 +183,7 @@ class MatrixHttpClient(BaseHttpClient): auth_headers = [] - for key,sig in request["signatures"][self.server_name].items(): + for key, sig in request["signatures"][self.server_name].items(): auth_headers.append(bytes( "X-Matrix origin=%s,key=\"%s\",sig=\"%s\"" % ( self.server_name, key, sig, @@ -276,7 +278,6 @@ class MatrixHttpClient(BaseHttpClient): defer.returnValue(json.loads(body)) - def _getEndpoint(self, reactor, destination): return matrix_endpoint( reactor, destination, timeout=10, @@ -351,6 +352,7 @@ class IdentityServerHttpClient(BaseHttpClient): defer.returnValue(json.loads(body)) + class CaptchaServerHttpClient(MatrixHttpClient): """Separate HTTP client for talking to google's captcha servers""" @@ -384,6 +386,7 @@ class CaptchaServerHttpClient(MatrixHttpClient): else: raise e + def _print_ex(e): if hasattr(e, "reasons") and e.reasons: for ex in e.reasons: |