summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-27 14:32:08 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-27 14:32:08 +0100
commit453adf00b67fc9156050678640caa38a71181ebf (patch)
treeb9cff3315a17be6a5a3979c9ff22016cd1d2194e /synapse
parentMerge remote-tracking branch 'origin/develop' into rav/use_run_in_background (diff)
downloadsynapse-453adf00b67fc9156050678640caa38a71181ebf.tar.xz
pep8; remove spurious import
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 0f26b91862..23502eda70 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -31,7 +31,7 @@ from synapse.types import (
     UserID, RoomAlias, RoomStreamToken,
 )
 from synapse.util.async import run_on_reactor, ReadWriteLock, Limiter
-from synapse.util.logcontext import preserve_fn, run_in_background
+from synapse.util.logcontext import run_in_background
 from synapse.util.metrics import measure_func
 from synapse.util.frozenutils import frozendict_json_encoder
 from synapse.util.stringutils import random_string