Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
raise_from already raises
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston committed Feb 25, 2019
1 parent 65bf9f1 commit 65d1003
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions synapse/crypto/keyring.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,11 @@ def get_server_verify_key_v2_indirect(self, server_names_and_key_ids,
long_retries=True,
)
except (NotRetryingDestination, RequestSendFailed) as e:
raise raise_from(
raise_from(
KeyLookupError("Failed to connect to remote server"), e,
)
except HttpResponseException as e:
raise raise_from(
raise_from(
KeyLookupError("Remote server returned an error"), e,
)

Expand Down Expand Up @@ -530,11 +530,11 @@ def get_server_verify_key_v2_direct(self, server_name, key_ids):
ignore_backoff=True,
)
except (NotRetryingDestination, RequestSendFailed) as e:
raise raise_from(
raise_from(
KeyLookupError("Failed to connect to remote server"), e,
)
except HttpResponseException as e:
raise raise_from(
raise_from(
KeyLookupError("Remote server returned an error"), e,
)

Expand Down

0 comments on commit 65d1003

Please sign in to comment.