diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-21 07:51:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 07:51:48 -0400 |
| commit | de119063f248981510e961e83f1515a3add19a21 (patch) | |
| tree | 6db9829b4c8cf7286a57b8f968da5679450773cf /synapse/federation | |
| parent | Element CSS and logo in email templates (#7919) (diff) | |
| download | synapse-de119063f248981510e961e83f1515a3add19a21.tar.xz | |
Convert room list handler to async/await. (#7912)
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/transport/server.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index d1bac318e7..24f7d4b3bc 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -20,8 +20,6 @@ import logging import re from typing import Optional, Tuple, Type -from twisted.internet.defer import maybeDeferred - import synapse from synapse.api.errors import Codes, FederationDeniedError, SynapseError from synapse.api.room_versions import RoomVersions @@ -795,12 +793,8 @@ class PublicRoomList(BaseFederationServlet): # zero is a special value which corresponds to no limit. limit = None - data = await maybeDeferred( - self.handler.get_local_public_room_list, - limit, - since_token, - network_tuple=network_tuple, - from_federation=True, + data = await self.handler.get_local_public_room_list( + limit, since_token, network_tuple=network_tuple, from_federation=True ) return 200, data |