summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-25 14:34:03 +0000
committerErik Johnston <erik@matrix.org>2019-02-25 14:34:03 +0000
commit65d1003d01f7dc301340224be70e9999c2c50065 (patch)
treeeec2cccc1a63a5246efc6d7989c69b3b3e8ee770 /synapse/crypto
parentNewsfile (diff)
downloadsynapse-65d1003d01f7dc301340224be70e9999c2c50065.tar.xz
raise_from already raises
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/keyring.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py

index 8c125e3a46..7474fd515f 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py
@@ -450,11 +450,11 @@ class Keyring(object): 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, ) @@ -530,11 +530,11 @@ class Keyring(object): 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, )