summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/handlers/federation.py2
-rw-r--r--synapse/handlers/federation_event.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 7bc11f736f..3f5d1d701f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -17,7 +17,6 @@ import logging 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,7 +56,6 @@ 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 diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 6952c879a8..2be3ef89a3 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py
@@ -72,7 +72,7 @@ from synapse.types import ( get_domain_from_id, ) from synapse.util.async_helpers import Linearizer, concurrently_execute -from synapse.util.iterutils import batch_iter, sorted_topologically +from synapse.util.iterutils import batch_iter from synapse.util.retryutils import NotRetryingDestination from synapse.util.stringutils import shortstr