From 29492b7e8580448b51d05b35684f9d6741872ba2 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Fri, 29 Sep 2023 13:44:29 -0400 Subject: Lint. --- synapse/storage/databases/main/event_federation.py | 14 ++++++++++---- synapse/storage/databases/main/event_push_actions.py | 2 +- synapse/storage/databases/main/user_directory.py | 8 ++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'synapse/storage/databases') diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py index e2e0717412..6d0d8a5402 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -47,7 +47,7 @@ from synapse.storage.database import ( ) from synapse.storage.databases.main.events_worker import EventsWorkerStore from synapse.storage.databases.main.signatures import SignatureWorkerStore -from synapse.storage.engines import PostgresEngine, Sqlite3Engine, Psycopg2Engine +from synapse.storage.engines import PostgresEngine, Psycopg2Engine, Sqlite3Engine from synapse.types import JsonDict, StrCollection from synapse.util import json_encoder from synapse.util.caches.descriptors import cached @@ -332,9 +332,13 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas AND sequence_number <= max_seq ) TO STDOUT - """ % (", ".join("(?, ?)" for _ in chains)) + """ % ( + ", ".join("(?, ?)" for _ in chains) + ) # Flatten the arguments. - rows = txn.copy_read(sql, list(itertools.chain.from_iterable(chains.items()))) + rows = txn.copy_read( + sql, list(itertools.chain.from_iterable(chains.items())) + ) results.update(r for r, in rows) else: # For SQLite we just fall back to doing a noddy for loop. @@ -622,7 +626,9 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas AND min_seq < sequence_number AND sequence_number <= max_seq ) TO STDOUT - """ % (", ".join("(?, ?, ?)" for _ in args)) + """ % ( + ", ".join("(?, ?, ?)" for _ in args) + ) # Flatten the arguments. rows = txn.copy_read(sql, list(itertools.chain.from_iterable(args))) result.update(r for r, in rows) diff --git a/synapse/storage/databases/main/event_push_actions.py b/synapse/storage/databases/main/event_push_actions.py index ba99e63d26..ed29d1fa5d 100644 --- a/synapse/storage/databases/main/event_push_actions.py +++ b/synapse/storage/databases/main/event_push_actions.py @@ -96,10 +96,10 @@ from synapse.storage.database import ( DatabasePool, LoggingDatabaseConnection, LoggingTransaction, - PostgresEngine, ) from synapse.storage.databases.main.receipts import ReceiptsWorkerStore from synapse.storage.databases.main.stream import StreamWorkerStore +from synapse.storage.engines import PostgresEngine from synapse.types import JsonDict from synapse.util import json_encoder from synapse.util.caches.descriptors import cached diff --git a/synapse/storage/databases/main/user_directory.py b/synapse/storage/databases/main/user_directory.py index 96379602ba..ed41e52201 100644 --- a/synapse/storage/databases/main/user_directory.py +++ b/synapse/storage/databases/main/user_directory.py @@ -54,8 +54,12 @@ from synapse.storage.database import ( ) from synapse.storage.databases.main.state import StateFilter from synapse.storage.databases.main.state_deltas import StateDeltasStore -from synapse.storage.engines import PostgresEngine, Sqlite3Engine, PsycopgEngine, \ - Psycopg2Engine +from synapse.storage.engines import ( + PostgresEngine, + Psycopg2Engine, + PsycopgEngine, + Sqlite3Engine, +) from synapse.types import ( JsonDict, UserID, -- cgit 1.5.1