|
@@ -171,10 +171,7 @@ class LoggingDatabaseConnection:
|
|
|
|
|
|
|
|
|
# The type of entry which goes on our after_callbacks and exception_callbacks lists.
|
|
|
-#
|
|
|
-# Python 3.5.2 doesn't support Callable with an ellipsis, so we wrap it in quotes so
|
|
|
-# that mypy sees the type but the runtime python doesn't.
|
|
|
-_CallbackListEntry = Tuple["Callable[..., None]", Iterable[Any], Dict[str, Any]]
|
|
|
+_CallbackListEntry = Tuple[Callable[..., None], Iterable[Any], Dict[str, Any]]
|
|
|
|
|
|
|
|
|
R = TypeVar("R")
|
|
@@ -221,7 +218,7 @@ class LoggingTransaction:
|
|
|
self.after_callbacks = after_callbacks
|
|
|
self.exception_callbacks = exception_callbacks
|
|
|
|
|
|
- def call_after(self, callback: "Callable[..., None]", *args: Any, **kwargs: Any):
|
|
|
+ def call_after(self, callback: Callable[..., None], *args: Any, **kwargs: Any):
|
|
|
"""Call the given callback on the main twisted thread after the
|
|
|
transaction has finished. Used to invalidate the caches on the
|
|
|
correct thread.
|
|
@@ -233,7 +230,7 @@ class LoggingTransaction:
|
|
|
self.after_callbacks.append((callback, args, kwargs))
|
|
|
|
|
|
def call_on_exception(
|
|
|
- self, callback: "Callable[..., None]", *args: Any, **kwargs: Any
|
|
|
+ self, callback: Callable[..., None], *args: Any, **kwargs: Any
|
|
|
):
|
|
|
# if self.exception_callbacks is None, that means that whatever constructed the
|
|
|
# LoggingTransaction isn't expecting there to be any callbacks; assert that
|
|
@@ -485,7 +482,7 @@ class DatabasePool:
|
|
|
desc: str,
|
|
|
after_callbacks: List[_CallbackListEntry],
|
|
|
exception_callbacks: List[_CallbackListEntry],
|
|
|
- func: "Callable[..., R]",
|
|
|
+ func: Callable[..., R],
|
|
|
*args: Any,
|
|
|
**kwargs: Any,
|
|
|
) -> R:
|
|
@@ -618,7 +615,7 @@ class DatabasePool:
|
|
|
async def runInteraction(
|
|
|
self,
|
|
|
desc: str,
|
|
|
- func: "Callable[..., R]",
|
|
|
+ func: Callable[..., R],
|
|
|
*args: Any,
|
|
|
db_autocommit: bool = False,
|
|
|
**kwargs: Any,
|
|
@@ -678,7 +675,7 @@ class DatabasePool:
|
|
|
|
|
|
async def runWithConnection(
|
|
|
self,
|
|
|
- func: "Callable[..., R]",
|
|
|
+ func: Callable[..., R],
|
|
|
*args: Any,
|
|
|
db_autocommit: bool = False,
|
|
|
**kwargs: Any,
|