diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-27 13:46:16 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-27 13:46:16 +0100 |
commit | 9773abf3d8e1b2711e936ff150d8ae2f48f98be9 (patch) | |
tree | b8c98e96f1262bba37a7ec58bcc7373fdd99a751 /synapse/handlers/sync.py | |
parent | Merge remote-tracking branch 'origin/release-v1.32.2' into matrix-org-hotfixes (diff) | |
parent | Remove various bits of compatibility code for Python <3.6 (#9879) (diff) | |
download | synapse-9773abf3d8e1b2711e936ff150d8ae2f48f98be9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r-- | synapse/handlers/sync.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index d2ba805f86..3ffc4628cb 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -14,7 +14,17 @@ # limitations under the License. import itertools import logging -from typing import TYPE_CHECKING, Any, Dict, FrozenSet, List, Optional, Set, Tuple +from typing import ( + TYPE_CHECKING, + Any, + Collection, + Dict, + FrozenSet, + List, + Optional, + Set, + Tuple, +) import attr from prometheus_client import Counter @@ -28,7 +38,6 @@ from synapse.push.clientformat import format_push_rules_for_user from synapse.storage.roommember import MemberSummary from synapse.storage.state import StateFilter from synapse.types import ( - Collection, JsonDict, MutableStateMap, Requester, |