Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-24 18:13:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Rename async to async_helpers because async is a keyword on Python 3.7 (#3678)

Browse source
This commit is contained in:
Amber Brown 2018-08-10 23:50:21 +10:00 • committed by GitHub
parent 3c0213a217
commit b37c472419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/federation/federation_server.py
View file

@ -40,7 +40,7 @@ from synapse.federation.persistence import TransactionActions
from synapse.federation.units import Edu, Transaction
from synapse.http.endpoint import parse_server_name
from synapse.types import get_domain_from_id
from synapse.util import async
from synapse.util.async_helpers import Linearizer, concurrently_execute
from synapse.util.caches.response_cache import ResponseCache
from synapse.util.logutils import log_function
@ -67,8 +67,8 @@ class FederationServer(FederationBase):
self.auth = hs.get_auth()
self.handler = hs.get_handlers().federation_handler
self._server_linearizer = async.Linearizer("fed_server")
self._transaction_linearizer = async.Linearizer("fed_txn_handler")
self._server_linearizer = Linearizer("fed_server")
self._transaction_linearizer = Linearizer("fed_txn_handler")
self.transaction_actions = TransactionActions(self.store)
@ -200,7 +200,7 @@ class FederationServer(FederationBase):
event_id, f.getTraceback().rstrip(),
)
yield async.concurrently_execute(
yield concurrently_execute(
process_pdus_for_room, pdus_by_room.keys(),
TRANSACTION_CONCURRENCY_LIMIT,
)