diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-04-22 16:43:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 16:43:50 +0100 |
| commit | 294c67503300b6bfa7785a5cfa55e25c1e452574 (patch) | |
| tree | 51ce6340ba5f84e6cfb3dd53dd3e0c236105ce83 /synapse/util | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-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/util')
| -rw-r--r-- | synapse/util/caches/stream_change_cache.py | 3 | ||||
| -rw-r--r-- | synapse/util/iterutils.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/util/caches/stream_change_cache.py b/synapse/util/caches/stream_change_cache.py index 0469e7d120..e81e468899 100644 --- a/synapse/util/caches/stream_change_cache.py +++ b/synapse/util/caches/stream_change_cache.py @@ -14,11 +14,10 @@ import logging import math -from typing import Dict, FrozenSet, List, Mapping, Optional, Set, Union +from typing import Collection, Dict, FrozenSet, List, Mapping, Optional, Set, Union from sortedcontainers import SortedDict -from synapse.types import Collection from synapse.util import caches logger = logging.getLogger(__name__) diff --git a/synapse/util/iterutils.py b/synapse/util/iterutils.py index 6f73b1d56d..abfdc29832 100644 --- a/synapse/util/iterutils.py +++ b/synapse/util/iterutils.py @@ -15,6 +15,7 @@ import heapq from itertools import islice from typing import ( + Collection, Dict, Generator, Iterable, @@ -26,8 +27,6 @@ from typing import ( TypeVar, ) -from synapse.types import Collection - T = TypeVar("T") |