diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index d7d202f028..d9c85e411e 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -913,9 +913,9 @@ class DatabasePool:
try:
with opentracing.start_active_span(f"db.{desc}"):
- result = await self.runWithConnection(
+ result: R = await self.runWithConnection(
# mypy seems to have an issue with this, maybe a bug?
- self.new_transaction, # type: ignore[arg-type]
+ self.new_transaction,
desc,
after_callbacks,
async_after_callbacks,
@@ -934,7 +934,7 @@ class DatabasePool:
await async_callback(*async_args, **async_kwargs)
for after_callback, after_args, after_kwargs in after_callbacks:
after_callback(*after_args, **after_kwargs)
- return cast(R, result)
+ return result
except Exception:
for exception_callback, after_args, after_kwargs in exception_callbacks:
exception_callback(*after_args, **after_kwargs)
diff --git a/synapse/storage/databases/main/events_worker.py b/synapse/storage/databases/main/events_worker.py
index 4c09567a7a..81fccfbccb 100644
--- a/synapse/storage/databases/main/events_worker.py
+++ b/synapse/storage/databases/main/events_worker.py
@@ -1876,7 +1876,7 @@ class EventsWorkerStore(SQLBaseStore):
# Type safety: iterating over `txn` yields `Tuple`, i.e.
# `Tuple[Any, ...]` of arbitrary length. Mypy detects assigning a
# variadic tuple to a fixed length tuple and flags it up as an error.
- for row in txn: # type: ignore[assignment]
+ for row in txn:
new_event_updates.append((row[0], row[1:]))
limited = False
@@ -1903,7 +1903,7 @@ class EventsWorkerStore(SQLBaseStore):
# Type safety: iterating over `txn` yields `Tuple`, i.e.
# `Tuple[Any, ...]` of arbitrary length. Mypy detects assigning a
# variadic tuple to a fixed length tuple and flags it up as an error.
- for row in txn: # type: ignore[assignment]
+ for row in txn:
new_event_updates.append((row[0], row[1:]))
if len(new_event_updates) >= limit:
|
