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/app | |
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/app')
-rw-r--r-- | synapse/app/federation_sender.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index e082d45c94..7bbf0ad082 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -40,7 +40,7 @@ from synapse.replication.slave.storage.transactions import TransactionStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.server import HomeServer from synapse.storage.engines import create_engine -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.httpresourcetree import create_resource_tree from synapse.util.logcontext import LoggingContext, run_in_background from synapse.util.manhole import manhole |