Merge remote-tracking branch 'origin/develop' into release-v1.111

2 files changed, 3 insertions, 1 deletions

diff --git a/changelog.d/17411.misc b/changelog.d/17411.misc
new file mode 100644

index 0000000000..ca9830c136
--- /dev/null
+++ b/changelog.d/17411.misc
@@ -0,0 +1 @@
+Fix linting errors from new `ruff` version.
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py

index b435588da0..d097e65ea7 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -322,6 +322,7 @@ class PerDestinationQueue:
         )
 
     async def _transaction_transmission_loop(self) -> None:
+        pending_pdus: List[EventBase] = []
         try:
             self.transmission_loop_running = True
 
@@ -341,7 +342,7 @@ class PerDestinationQueue:
                 self._new_data_to_send = False
 
                 async with _TransactionQueueManager(self) as (
-                    pending_pdus,
+                    pending_pdus,  # noqa: F811
                     pending_edus,
                 ):
                     if not pending_pdus and not pending_edus: