summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py4
-rw-r--r--synapse/storage/databases/main/event_federation.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index c2163c7e53..e7570310c5 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -16,8 +16,8 @@ """Contains handlers for federation events.""" import logging -from queue import Empty, PriorityQueue from http import HTTPStatus +from queue import Empty, PriorityQueue from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Union from signedjson.key import decode_verify_key_bytes @@ -57,12 +57,12 @@ from synapse.replication.http.federation import ( ReplicationCleanRoomRestServlet, ReplicationStoreRoomOnOutlierMembershipRestServlet, ) +from synapse.storage.databases.main.event_federation import BackfillQueueNavigationItem from synapse.storage.databases.main.events_worker import EventRedactBehaviour from synapse.types import JsonDict, StateMap, get_domain_from_id from synapse.util.async_helpers import Linearizer from synapse.util.retryutils import NotRetryingDestination from synapse.visibility import filter_events_for_server -from synapse.storage.databases.main.event_federation import BackfillQueueNavigationItem if TYPE_CHECKING: from synapse.server import HomeServer diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py
index a569e8146a..8107cfa53a 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py
@@ -14,7 +14,7 @@ import itertools import logging from queue import Empty, PriorityQueue -from typing import Collection, Dict, Iterable, List, Optional, Set, Tuple, NamedTuple +from typing import Collection, Dict, Iterable, List, NamedTuple, Optional, Set, Tuple from prometheus_client import Counter, Gauge