diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
commit | 3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch) | |
tree | 741c28822a3b5e26d229be68bc06c95a25218748 /synapse/crypto/keyclient.py | |
parent | Allow backslashes in event field filters (diff) | |
parent | Merge pull request #4082 from matrix-org/rav/fix_pep8 (diff) | |
download | synapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'synapse/crypto/keyclient.py')
-rw-r--r-- | synapse/crypto/keyclient.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 57d4665e84..080c81f14b 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -55,7 +55,7 @@ def fetch_server_key(server_name, tls_client_options_factory, path=KEY_API_V1): raise IOError("Cannot get key for %r" % server_name) except (ConnectError, DomainError) as e: logger.warn("Error getting key for %r: %s", server_name, e) - except Exception as e: + except Exception: logger.exception("Error getting key for %r", server_name) raise IOError("Cannot get key for %r" % server_name) |