ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 11:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The function should return a coroutine.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-03-28 11:11:44 -04:00
parent bd7c61cc5c
commit 80d8e5b465
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/util/deferredutil.py
View File

@ -13,8 +13,9 @@ from typing import (
Sequence, Sequence,
TypeVar, TypeVar,
Optional, Optional,
Coroutine,
) )
from typing_extensions import Awaitable, ParamSpec from typing_extensions import ParamSpec
from foolscap.api import eventually from foolscap.api import eventually
from eliot.twisted import ( from eliot.twisted import (
@ -230,7 +231,7 @@ P = ParamSpec("P")
R = TypeVar("R") R = TypeVar("R")
def async_to_deferred(f: Callable[P, Awaitable[R]]) -> Callable[P, Deferred[R]]: def async_to_deferred(f: Callable[P, Coroutine[defer.Deferred[R], None, R]]) -> Callable[P, Deferred[R]]:
""" """
Wrap an async function to return a Deferred instead. Wrap an async function to return a Deferred instead.
@ -239,12 +240,7 @@ def async_to_deferred(f: Callable[P, Awaitable[R]]) -> Callable[P, Deferred[R]]:
@wraps(f) @wraps(f)
def not_async(*args: P.args, **kwargs: P.kwargs) -> Deferred[R]: def not_async(*args: P.args, **kwargs: P.kwargs) -> Deferred[R]:
# Twisted documents fromCoroutine as accepting either a Generator or a return defer.Deferred.fromCoroutine(f(*args, **kwargs))
# Coroutine. However, the standard for type annotations of async
# functions is to return an Awaitable:
# https://github.com/twisted/twisted/issues/11832
# So, we ignore the type warning.
return defer.Deferred.fromCoroutine(f(*args, **kwargs)) # type: ignore
return not_async return not_async