diff options
| author | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
|---|---|---|
| committer | Dan Callahan <danc@element.io> | 2021-01-26 15:38:22 +0000 |
| commit | a06dd1d6b5a36a473ad58c186cac61ba929dc154 (patch) | |
| tree | 5a8d355e61b47803acbc8cfabf391b4059b29dcf /synapse/rest/client | |
| parent | Fix state endpoint to be faster (diff) | |
| parent | Tweak changes. (diff) | |
| download | synapse-a06dd1d6b5a36a473ad58c186cac61ba929dc154.tar.xz | |
Merge tag 'v1.26.0rc2' into travis/fosdem/hotfixes github/travis/fosdem/hotfixes travis/fosdem/hotfixes
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index e6725b03b0..f95627ee61 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -32,7 +32,6 @@ from synapse.api.errors import ( ) from synapse.api.filtering import Filter from synapse.events.utils import format_event_for_client_v2 -from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.servlet import ( RestServlet, assert_params_in_dict, @@ -47,7 +46,7 @@ from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig from synapse.types import RoomAlias, RoomID, StreamToken, ThirdPartyInstanceID, UserID from synapse.util import json_decoder -from synapse.util.stringutils import random_string +from synapse.util.stringutils import parse_and_validate_server_name, random_string if TYPE_CHECKING: import synapse.server |