From 65d1003d01f7dc301340224be70e9999c2c50065 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 25 Feb 2019 14:34:03 +0000
Subject: [PATCH] raise_from already raises
---
synapse/crypto/keyring.py | 8 ++++----
1 file 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,
)
--
GitLab