summary refs log tree commit diff
path: root/synapse/state/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-04-22 16:43:50 +0100
committerGitHub <noreply@github.com>2021-04-22 16:43:50 +0100
commit294c67503300b6bfa7785a5cfa55e25c1e452574 (patch)
tree51ce6340ba5f84e6cfb3dd53dd3e0c236105ce83 /synapse/state/__init__.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-294c67503300b6bfa7785a5cfa55e25c1e452574.tar.xz
Remove `synapse.types.Collection` (#9856)
This is no longer required, since we have dropped support for Python 3.5.
Diffstat (limited to 'synapse/state/__init__.py')
-rw-r--r--synapse/state/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index c7ee731154..b3bd92d37c 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -19,6 +19,7 @@ from typing import (
     Any,
     Awaitable,
     Callable,
+    Collection,
     DefaultDict,
     Dict,
     FrozenSet,
@@ -46,7 +47,7 @@ from synapse.logging.utils import log_function
 from synapse.state import v1, v2
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.storage.roommember import ProfileInfo
-from synapse.types import Collection, StateMap
+from synapse.types import StateMap
 from synapse.util.async_helpers import Linearizer
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.metrics import Measure, measure_func