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/room_member.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/room_member.py')
-rw-r--r-- | synapse/handlers/room_member.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 0d4a3f4677..fb94b5d7d4 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -30,7 +30,7 @@ import synapse.types from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, Codes, SynapseError from synapse.types import RoomID, UserID -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.distributor import user_joined_room, user_left_room logger = logging.getLogger(__name__) |