Fix the type annotation on run_db_interaction in the Module API. (#…

…16089) * Fix the method signature of `run_db_interaction` on the module API * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> --------- Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
matrix-org · Aug 10, 2023 · 7f4b413 · 7f4b413
1 parent efd4d06
commit 7f4b413
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/16089.misc b/changelog.d/16089.misc
@@ -0,0 +1 @@
+Fix the type annotation on `run_db_interaction` in the Module API.
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py
@@ -31,7 +31,7 @@
 
 import attr
 import jinja2
-from typing_extensions import ParamSpec
+from typing_extensions import Concatenate, ParamSpec
 
 from twisted.internet import defer
 from twisted.internet.interfaces import IDelayedCall
@@ -885,7 +885,7 @@ def invalidate_access_token(
     def run_db_interaction(
         self,
         desc: str,
-        func: Callable[P, T],
+        func: Callable[Concatenate[LoggingTransaction, P], T],
         *args: P.args,
         **kwargs: P.kwargs,
     ) -> "defer.Deferred[T]":
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix the type annotation on `run_db_interaction` in the Module API.