aiomisc 17.5.6__tar.gz → 17.5.10__tar.gz

{aiomisc-17.5.6 → aiomisc-17.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiomisc
-Version: 17.5.6
+Version: 17.5.10
 Summary: aiomisc - miscellaneous utils for asyncio
 Home-page: https://github.com/aiokitchen/aiomisc
 License: MIT

{aiomisc-17.5.6 → aiomisc-17.5.10}/aiomisc/backoff.py

@@ -1,4 +1,5 @@
 import asyncio
+import sys
 from functools import wraps
 from typing import (
     Any, Awaitable, Callable, Optional, Tuple, Type, TypeVar, Union,
@@ -8,12 +9,15 @@ from .counters import Statistic
 from .timeout import timeout
 
 
-Number = Union[int, float]
-T = TypeVar("T")
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
 
 
-WrapReturnType = Callable[..., Awaitable[T]]
-ReturnType = Callable[..., WrapReturnType]
+Number = Union[int, float]
+T = TypeVar("T")
+P = ParamSpec("P")
 
 
 class BackoffStatistic(Statistic):
@@ -38,7 +42,7 @@ def asyncbackoff(
     giveup: Optional[Callable[[Exception], bool]] = None,
     statistic_name: Optional[str] = None,
     statistic_class: Type[BackoffStatistic] = BackoffStatistic,
-) -> ReturnType:
+) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
     """
     Patametric decorator that ensures that ``attempt_timeout`` and
     ``deadline`` time limits are met by decorated function.
@@ -81,12 +85,12 @@ def asyncbackoff(
     exceptions = tuple(exceptions) or ()
     exceptions += asyncio.TimeoutError,
 
-    def decorator(func: WrapReturnType) -> WrapReturnType:
+    def decorator(func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
         if attempt_timeout is not None:
             func = timeout(attempt_timeout)(func)
 
         @wraps(func)
-        async def wrap(*args: Any, **kwargs: Any) -> T:
+        async def wrap(*args: P.args, **kwargs: P.kwargs) -> T:
             last_exc = None
             tries = 0
 
@@ -141,7 +145,7 @@ def asyncretry(
     pause: Number = 0,
     giveup: Optional[Callable[[Exception], bool]] = None,
     statistic_name: Optional[str] = None,
-) -> ReturnType:
+) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
     """
     Shortcut of ``asyncbackoff(None, None, 0, Exception)``.
 

aiomisc-17.5.10/aiomisc/timeout.py

@@ -0,0 +1,34 @@
+import asyncio
+import sys
+from functools import wraps
+from typing import Awaitable, Callable, TypeVar, Union
+
+
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
+
+
+T = TypeVar("T")
+P = ParamSpec("P")
+Number = Union[int, float]
+
+
+def timeout(
+    value: Number
+) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
+    def decorator(
+        func: Callable[P, Awaitable[T]],
+    ) -> Callable[P, Awaitable[T]]:
+        if not asyncio.iscoroutinefunction(func):
+            raise TypeError("Function is not a coroutine function")
+
+        @wraps(func)
+        async def wrap(*args: P.args, **kwargs: P.kwargs) -> T:
+            return await asyncio.wait_for(
+                func(*args, **kwargs),
+                timeout=value,
+            )
+        return wrap
+    return decorator

{aiomisc-17.5.6 → aiomisc-17.5.10}/aiomisc/version.py

@@ -2,5 +2,5 @@
 # BY: poem-plugins "git" plugin
 # NEVER EDIT THIS FILE MANUALLY
 
-version_info = (17, 5, 6)
-__version__ = "17.5.6"
+version_info = (17, 5, 10)
+__version__ = "17.5.10"

{aiomisc-17.5.6 → aiomisc-17.5.10}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "aiomisc"
 # This is a dummy version which will be rewritten with poem-plugins
-version = "17.5.6"
+version = "17.5.10"
 description = "aiomisc - miscellaneous utils for asyncio"
 authors = ["Dmitry Orlov <me@mosquito.su>"]
 readme = "README.rst"

aiomisc-17.5.6/aiomisc/timeout.py

@@ -1,25 +0,0 @@
-import asyncio
-from functools import wraps
-from typing import Any, Awaitable, Callable, TypeVar, Union
-
-
-T = TypeVar("T")
-Number = Union[int, float]
-FuncType = Callable[..., Awaitable[T]]
-
-
-def timeout(value: Number) -> Callable[[FuncType], FuncType]:
-    def decorator(
-        func: FuncType,
-    ) -> FuncType:
-        if not asyncio.iscoroutinefunction(func):
-            raise TypeError("Function is not a coroutine function")
-
-        @wraps(func)
-        async def wrap(*args: Any, **kwargs: Any) -> T:
-            return await asyncio.wait_for(
-                func(*args, **kwargs),
-                timeout=value,
-            )
-        return wrap
-    return decorator