diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-10 23:50:21 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 23:50:21 +1000 |
| commit | b37c4724191995eec4f5bc9d64f176b2a315f777 (patch) | |
| tree | 7f8e79c27d1993c4355844017b2d12a2f2bea656 /tests | |
| parent | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests (diff) | |
| download | synapse-b37c4724191995eec4f5bc9d64f176b2a315f777.tar.xz | |
Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)
Diffstat (limited to '')
| -rw-r--r-- | tests/storage/test__base.py | 2 | ||||
| -rw-r--r-- | tests/util/test_linearizer.py | 2 | ||||
| -rw-r--r-- | tests/util/test_rwlock.py | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/tests/util/test_linearizer.py b/tests/util/test_linearizer.py index 4729bd5a0a..7f48a72de8 100644 --- a/tests/util/test_linearizer.py +++ b/tests/util/test_linearizer.py @@ -20,7 +20,7 @@ from twisted.internet import defer, reactor from twisted.internet.defer import CancelledError from synapse.util import Clock, logcontext -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from tests import unittest diff --git a/tests/util/test_rwlock.py b/tests/util/test_rwlock.py index 24194e3b25..7cd470be67 100644 --- a/tests/util/test_rwlock.py +++ b/tests/util/test_rwlock.py @@ -14,7 +14,7 @@ # limitations under the License. -from synapse.util.async import ReadWriteLock +from synapse.util.async_helpers import ReadWriteLock from tests import unittest |