diff options
| author | reivilibre <oliverw@matrix.org> | 2022-08-31 11:16:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-31 11:16:05 +0000 |
| commit | 7bc110a19e6de0572b0c9513726d13298b45ced2 (patch) | |
| tree | 98eb1a5b1f616c057508b1dcae61b0c8b3954dfd /synapse/rest | |
| parent | Fix admin List Room API return type on sqlite (#13509) (diff) | |
| download | synapse-7bc110a19e6de0572b0c9513726d13298b45ced2.tar.xz | |
Generalise the `@cancellable` annotation so it can be used on functions other than just servlet methods. (#13662)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index 3259de4802..0e2834008e 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -37,7 +37,7 @@ from synapse.api.errors import ( ) from synapse.api.filtering import Filter from synapse.events.utils import format_event_for_client_v2 -from synapse.http.server import HttpServer, cancellable +from synapse.http.server import HttpServer from synapse.http.servlet import ( ResolveRoomIdMixin, RestServlet, @@ -57,6 +57,7 @@ from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig from synapse.types import JsonDict, StreamToken, ThirdPartyInstanceID, UserID from synapse.util import json_decoder +from synapse.util.cancellation import cancellable from synapse.util.stringutils import parse_and_validate_server_name, random_string if TYPE_CHECKING: |