From dcb6fc50235937fafbc7d16f18772624e4f5be6e Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Thu, 5 Aug 2021 15:35:25 +0100 Subject: Predicate it on TYPE_CHECKING (not that it improves things) --- synapse/storage/state.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/synapse/storage/state.py b/synapse/storage/state.py index e1de433384..c91f0de58e 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging -from typing import FrozenSet # noqa: used within quoted type hint; flake8 sad from typing import ( TYPE_CHECKING, Awaitable, @@ -33,6 +32,8 @@ from synapse.events import EventBase from synapse.types import MutableStateMap, StateMap if TYPE_CHECKING: + from typing import FrozenSet # noqa: used within quoted type hint; flake8 sad + from synapse.server import HomeServer from synapse.storage.databases import Databases @@ -111,7 +112,9 @@ class StateFilter: type_dict.setdefault(typ, set()).add(s) # type: ignore - return StateFilter(types=frozendict(type_dict)) + return StateFilter( + types=frozendict((k, frozenset(v)) for k, v in type_dict.items()) + ) @staticmethod def from_lazy_load_member_list(members: Iterable[str]) -> "StateFilter": @@ -125,7 +128,8 @@ class StateFilter: The new state filter """ return StateFilter( - types=frozendict({EventTypes.Member: set(members)}), include_others=True + types=frozendict({EventTypes.Member: frozenset(members)}), + include_others=True, ) def return_expanded(self) -> "StateFilter": -- cgit 1.5.1