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/handlers/initial_sync.py | |
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/handlers/initial_sync.py')
-rw-r--r-- | synapse/handlers/initial_sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 40e7580a61..1fb17fd9a5 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -25,7 +25,7 @@ from synapse.handlers.presence import format_user_presence_state from synapse.streams.config import PaginationConfig from synapse.types import StreamToken, UserID from synapse.util import unwrapFirstError -from synapse.util.async import concurrently_execute +from synapse.util.async_helpers import concurrently_execute from synapse.util.caches.snapshot_cache import SnapshotCache from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.visibility import filter_events_for_client |