diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-08 16:32:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-08 16:33:01 +0100 |
| commit | 4ac194159200e9cfb0020003409592e5324cbd18 (patch) | |
| tree | 809b84bf3420d4a77edddf0d56bbfe2d970d20a5 | |
| parent | Change the way we do logging contexts so that they survive divergences (diff) | |
| download | synapse-4ac194159200e9cfb0020003409592e5324cbd18.tar.xz | |
PEP8
| -rw-r--r-- | synapse/handlers/profile.py | 1 | ||||
| -rw-r--r-- | synapse/notifier.py | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index a7de7a80f8..ffb449d457 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -17,7 +17,6 @@ from twisted.internet import defer from synapse.api.errors import SynapseError, AuthError, CodeMessageException from synapse.api.constants import EventTypes, Membership -from synapse.util.logcontext import PreserveLoggingContext from synapse.types import UserID from ._base import BaseHandler diff --git a/synapse/notifier.py b/synapse/notifier.py index fbbccb38e6..7282dfd7f3 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -16,7 +16,6 @@ from twisted.internet import defer from synapse.util.logutils import log_function -from synapse.util.logcontext import preserve_context_over_deferred from synapse.types import StreamToken import synapse.metrics @@ -224,8 +223,8 @@ class Notifier(object): logger.exception("Failed to notify listener", failure) yield defer.DeferredList( - [notify(l).addErrback(eb) for l in listeners], - consumeErrors=True, + [notify(l).addErrback(eb) for l in listeners], + consumeErrors=True, ) @defer.inlineCallbacks |