Fix pep8 and pyflakes warnings

3 files changed, 8 insertions, 7 deletions

diff --git a/synapse/http/client.py b/synapse/http/client.py

index 5c3ddcd83d..048a428905 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -32,15 +32,16 @@ logger = logging.getLogger(__name__)
 
 class SimpleHttpClient(object):
     """
-    A simple, no-frills HTTP client with methods that wrap up common ways of using HTTP in Matrix
+    A simple, no-frills HTTP client with methods that wrap up common ways of
+    using HTTP in Matrix
     """
     def __init__(self, hs):
         self.hs = hs
         # The default context factory in Twisted 14.0.0 (which we require) is
-        # BrowserLikePolicyForHTTPS which will do regular cert validation 'like a browser'
+        # BrowserLikePolicyForHTTPS which will do regular cert validation
+        # 'like a browser'
         self.agent = Agent(reactor)
 
-
     @defer.inlineCallbacks
     def post_urlencoded_get_json(self, uri, args={}):
         logger.debug("post_urlencoded_get_json args: %s", args)
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py

index f1b14a5657..9c8888f565 100644
--- a/synapse/http/endpoint.py
+++ b/synapse/http/endpoint.py
@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 
 
 def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None,
-                    timeout=None):
+                               timeout=None):
     """Construct an endpoint for the given matrix destination.
 
     Args:
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index b179c76496..510f07dd7b 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -62,8 +62,8 @@ class MatrixFederationHttpAgent(_AgentBase):
 
 
 class MatrixFederationHttpClient(object):
-    """HTTP client used to talk to other homeservers over the federation protocol.
-    Send client certificates and signs requests.
+    """HTTP client used to talk to other homeservers over the federation
+    protocol. Send client certificates and signs requests.
 
     Attributes:
         agent (twisted.web.client.Agent): The twisted Agent used to send the
@@ -305,4 +305,4 @@ class _JsonProducer(object):
         pass
 
     def stopProducing(self):
-        pass
\ No newline at end of file
+        pass