summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeroen <vo.jeroen@gmail.com>2018-06-25 12:31:16 +0200
committerJeroen <vo.jeroen@gmail.com>2018-06-25 12:31:16 +0200
commit07b4f88de9ee534629db29aa4fc398607e7d866e (patch)
treed59cfabe4decd1c260fb6864f6fc897bad6aceda
parentsend SNI for federation requests (diff)
downloadsynapse-07b4f88de9ee534629db29aa4fc398607e7d866e.tar.xz
formatting changes for pep8
-rw-r--r--synapse/config/tls.py4
-rw-r--r--synapse/crypto/context_factory.py4
-rw-r--r--synapse/http/endpoint.py3
-rw-r--r--synapse/http/matrixfederationclient.py2
4 files changed, 8 insertions, 5 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 4e7d1bd93e..b09dc986ab 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -47,7 +47,9 @@ class TlsConfig(Config):
 
         self.tls_fingerprints = config["tls_fingerprints"]
 
-        self.tls_ignore_certificate_validation = config.get("tls_ignore_certificate_validation", False)
+        self.tls_ignore_certificate_validation = config.get(
+            "tls_ignore_certificate_validation", False
+        )
 
         # Check that our own certificate is included in the list of fingerprints
         # and include it if it is not.
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index 297a5fb045..415899e62b 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -14,8 +14,8 @@
 
 from twisted.internet import ssl
 from OpenSSL import SSL, crypto
-from twisted.internet._sslverify import _defaultCurveName, ClientTLSOptions, OpenSSLCertificateOptions, \
-    optionsForClientTLS
+from twisted.internet._sslverify import _defaultCurveName, ClientTLSOptions, \
+    OpenSSLCertificateOptions, optionsForClientTLS
 
 import logging
 
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py
index e783f95719..abf4862084 100644
--- a/synapse/http/endpoint.py
+++ b/synapse/http/endpoint.py
@@ -44,7 +44,8 @@ def matrix_federation_endpoint(reactor, destination, tls_client_options_factory=
     Args:
         reactor: Twisted reactor.
         destination (bytes): The name of the server to connect to.
-        tls_client_options_factory (synapse.crypto.context_factory.ClientTLSOptionsFactory): 
+        tls_client_options_factory
+            (synapse.crypto.context_factory.ClientTLSOptionsFactory):
             Factory which generates TLS options for client connections.
         timeout (int): connection timeout in seconds
     """
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 66796a202f..b48d05fcd2 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -69,7 +69,7 @@ class MatrixFederationEndpointFactory(object):
 
         return matrix_federation_endpoint(
             reactor, destination, timeout=10,
-            tls_client_options_factory = self.tls_client_options_factory
+            tls_client_options_factory=self.tls_client_options_factory
         )