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 /synapse/storage | |
| 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 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 2 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index ce32e8fefd..d4aa192a0a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -38,7 +38,7 @@ from synapse.storage.background_updates import BackgroundUpdateStore from synapse.storage.event_federation import EventFederationStore from synapse.storage.events_worker import EventsWorkerStore from synapse.types import RoomStreamToken, get_domain_from_id -from synapse.util.async import ObservableDeferred +from synapse.util.async_helpers import ObservableDeferred from synapse.util.caches.descriptors import cached, cachedInlineCallbacks from synapse.util.frozenutils import frozendict_json_encoder from synapse.util.logcontext import PreserveLoggingContext, make_deferred_yieldable diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 10dce21cea..9b4e6d6aa8 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -26,7 +26,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes, Membership from synapse.storage.events_worker import EventsWorkerStore from synapse.types import get_domain_from_id -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.caches import intern_string from synapse.util.caches.descriptors import cached, cachedInlineCallbacks from synapse.util.stringutils import to_ascii |