From b7336ff32d4f9883c06c538901f6566b7ccb1ebe Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 29 Dec 2016 00:09:33 +0000 Subject: [PATCH] Clean up --- synapse/http/endpoint.py | 6 ++++-- synapse/http/matrixfederationclient.py | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index 16ad09a48..4d361bbe7 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -14,7 +14,7 @@ # limitations under the License. from twisted.internet.endpoints import SSL4ClientEndpoint, TCP4ClientEndpoint -from twisted.internet import defer, reactor, task +from twisted.internet import defer, reactor from twisted.internet.error import ConnectError from twisted.names import client, dns from twisted.names.error import DNSNameError, DomainError @@ -72,7 +72,9 @@ def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None, endpoint_kw_args=endpoint_kw_args )) else: - return _WrappingEndointFac(transport_endpoint(reactor, domain, port, **endpoint_kw_args)) + return _WrappingEndointFac(transport_endpoint( + reactor, domain, port, **endpoint_kw_args + )) class _WrappingEndointFac(object): diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index da98d2d66..4d40219fc 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -61,11 +61,6 @@ MAX_LONG_RETRIES = 10 MAX_SHORT_RETRIES = 3 -def test(conn): - conn.loseConnection() - return conn - - class MatrixFederationEndpointFactory(object): def __init__(self, hs): self.tls_server_context_factory = hs.tls_server_context_factory