summary refs log tree commit diff
path: root/tests/storage
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-08-10 23:50:21 +1000
committerGitHub <noreply@github.com>2018-08-10 23:50:21 +1000
commitb37c4724191995eec4f5bc9d64f176b2a315f777 (patch)
tree7f8e79c27d1993c4355844017b2d12a2f2bea656 /tests/storage
parentMerge pull request #3439 from vojeroen/send_sni_for_federation_requests (diff)
downloadsynapse-b37c4724191995eec4f5bc9d64f176b2a315f777.tar.xz
Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)
Diffstat (limited to 'tests/storage')
-rw-r--r--tests/storage/test__base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test__base.py b/tests/storage/test__base.py
index 6d6f00c5c5..52eff2a104 100644
--- a/tests/storage/test__base.py
+++ b/tests/storage/test__base.py
@@ -18,7 +18,7 @@ from mock import Mock
 
 from twisted.internet import defer
 
-from synapse.util.async import ObservableDeferred
+from synapse.util.async_helpers import ObservableDeferred
 from synapse.util.caches.descriptors import Cache, cached
 
 from tests import unittest