summary refs log tree commit diff
path: root/synapse/util/async.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
commit39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch)
tree8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/util/async.py
parentCorrectly wire in update group profile over federation (diff)
parentMerge pull request #2568 from matrix-org/rav/pep8 (diff)
downloadsynapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/util/async.py')
-rw-r--r--synapse/util/async.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py
index a0a9039475..1a884e96ee 100644
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@@ -73,7 +73,7 @@ class ObservableDeferred(object):
                 try:
                     # TODO: Handle errors here.
                     self._observers.pop().callback(r)
-                except:
+                except Exception:
                     pass
             return r
 
@@ -83,7 +83,7 @@ class ObservableDeferred(object):
                 try:
                     # TODO: Handle errors here.
                     self._observers.pop().errback(f)
-                except:
+                except Exception:
                     pass
 
             if consumeErrors:
@@ -205,7 +205,7 @@ class Linearizer(object):
             try:
                 with PreserveLoggingContext():
                     yield current_defer
-            except:
+            except Exception:
                 logger.exception("Unexpected exception in Linearizer")
 
             logger.info("Acquired linearizer lock %r for key %r", self.name,