summary refs log tree commit diff
path: root/synapse/federation
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/federation
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/federation')
-rw-r--r--synapse/federation/federation_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 4efe95faa4..af0107a46e 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -800,7 +800,7 @@ class FederationHandlerRegistry(object):
             yield handler(origin, content)
         except SynapseError as e:
             logger.info("Failed to handle edu %r: %r", edu_type, e)
-        except Exception as e:
+        except Exception:
             logger.exception("Failed to handle edu %r", edu_type)
 
     def on_query(self, query_type, args):