tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Lint

Browse source
This commit is contained in:
Brendan Abolivier 2019-11-11 16:56:55 +00:00
parent 21056ad12a
commit 94cdd6fffe
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/federation/federation_client.py
View file

@ -751,7 +751,7 @@ class FederationClient(FederationBase):
# If we receive an error response that isn't a generic error, or an # If we receive an error response that isn't a generic error, or an
# unrecognised endpoint error, we assume that the remote understands # unrecognised endpoint error, we assume that the remote understands
# the v2 invite API and this is a legitimate error. # the v2 invite API and this is a legitimate error.
if not err.errcode in [Codes.UNKNOWN, Codes.UNRECOGNIZED]: if err.errcode not in [Codes.UNKNOWN, Codes.UNRECOGNIZED]:
raise err raise err
else: else:
raise e.to_synapse_error() raise e.to_synapse_error()
@ -878,7 +878,6 @@ class FederationClient(FederationBase):
@defer.inlineCallbacks @defer.inlineCallbacks
def send_request(destination): def send_request(destination):
time_now = self._clock.time_msec()
content = yield self._do_send_leave(destination, pdu) content = yield self._do_send_leave(destination, pdu)
logger.debug("Got content: %s", content) logger.debug("Got content: %s", content)
@ -906,7 +905,7 @@ class FederationClient(FederationBase):
# If we receive an error response that isn't a generic error, or an # If we receive an error response that isn't a generic error, or an
# unrecognised endpoint error, we assume that the remote understands # unrecognised endpoint error, we assume that the remote understands
# the v2 invite API and this is a legitimate error. # the v2 invite API and this is a legitimate error.
if not err.errcode in [Codes.UNKNOWN, Codes.UNRECOGNIZED]: if err.errcode not in [Codes.UNKNOWN, Codes.UNRECOGNIZED]:
raise err raise err
else: else:
raise e.to_synapse_error() raise e.to_synapse_error()