summary refs log tree commit diff
path: root/synapse/crypto/keyclient.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-24 10:35:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-24 10:39:03 +0100
commitef771cc4c2d988e5188ba7e75df9adebb0ebafe1 (patch)
treeebab02095acf97b5a4d4a03c4570acc6baaa1323 /synapse/crypto/keyclient.py
parentMerge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts (diff)
downloadsynapse-ef771cc4c2d988e5188ba7e75df9adebb0ebafe1.tar.xz
Fix a number of flake8 errors
Broadly three things here:

* disable W504 which seems a bit whacko
* remove a bunch of `as e` expressions from exception handlers that don't use
  them
* use `r""` for strings which include backslashes

Also, we don't use pep8 any more, so we can get rid of the duplicate config
there.
Diffstat (limited to 'synapse/crypto/keyclient.py')
-rw-r--r--synapse/crypto/keyclient.py2
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)