diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-19 11:19:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-19 11:19:47 +0100 |
| commit | 80d2d50f4764d6662ceef86f834f845b539263e8 (patch) | |
| tree | 38552d721181b4ca5a2b0817dfb7d088d754c1b9 | |
| parent | Replace custom DeferredTimeoutError with defer.TimeoutError (diff) | |
| download | synapse-80d2d50f4764d6662ceef86f834f845b539263e8.tar.xz | |
Fixup
| -rw-r--r-- | changelog.d/3910.bugfix (renamed from changelog.d/3910) | 0 | ||||
| -rw-r--r-- | synapse/notifier.py | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/changelog.d/3910 b/changelog.d/3910.bugfix index 22ec2adc33..22ec2adc33 100644 --- a/changelog.d/3910 +++ b/changelog.d/3910.bugfix diff --git a/synapse/notifier.py b/synapse/notifier.py index 2e7525b7d2..f1d92c1395 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -25,10 +25,7 @@ from synapse.api.errors import AuthError from synapse.handlers.presence import format_user_presence_state from synapse.metrics import LaterGauge from synapse.types import StreamToken -from synapse.util.async_helpers import ( - ObservableDeferred, - timeout_deferred, -) +from synapse.util.async_helpers import ObservableDeferred, timeout_deferred from synapse.util.logcontext import PreserveLoggingContext, run_in_background from synapse.util.logutils import log_function from synapse.util.metrics import Measure |