Merge pull request #10 from pomponchik/develop

0.0.11

awaits/awaitable.py

@@ -8,10 +8,10 @@
 from awaits.pools.abstract_pool import AbstractPool
 
 
-def awaitable(*args: Callable[[Any], Any], pool: Optional[Union[str, AbstractPool]] = None, delay: Optional[Union[int, float]] = None) -> Union[Callable[[Callable[[Any], Any]], Callable[[Any], Awaitable[Any]]], Callable[[Any], Awaitable[Any]]]:
+def awaitable(*args: Callable[[Any], Any], pool: Optional[Union[str, AbstractPool]] = None, delay: Optional[Union[int, float]] = None) -> Union[Callable[[Callable[..., Any]], Callable[..., Awaitable[Any]]], Callable[..., Awaitable[Any]]]:
     pool = get_pool_for_decorator(pool)
 
-    def wrapper_of_wrapper(function: Callable[[Any], Any]) -> Callable[[Any], Awaitable[Any]]:
+    def wrapper_of_wrapper(function: Callable[..., Any]) -> Callable[..., Awaitable[Any]]:
         @wraps(function)
         async def wrapper(*args: Any, **kwargs: Any) -> Any:
             sleep_time = CommonData().delay if delay is None else delay

awaits/pools/abstract_pool.py

@@ -39,7 +39,7 @@ def __getitem__(self, index: int) -> AbstractUnit:
     def queue(self) -> QueueProtocol:
         return self.get_queue()
 
-    def do(self, function: Callable[[Any], Any], *args: Any, **kwargs: Any) -> Task:
+    def do(self, function: Callable[..., Any], *args: Any, **kwargs: Any) -> Task:
         task = Task(function, *args, **kwargs)
         self.queue.put_nowait(task)
         return task

awaits/shoot.py

@@ -7,10 +7,10 @@
 from awaits.task import Task
 
 
-def shoot(*args: Callable[[Any], Any], pool: Optional[Union[str, AbstractPool]] = None) -> Union[Callable[[Callable[[Any], Any]], Callable[[Any], Any]], Callable[[Any], Any]]:
+def shoot(*args: Callable[[Any], Any], pool: Optional[Union[str, AbstractPool]] = None) -> Union[Callable[[Callable[..., Any]], Callable[..., Any]], Callable[..., Any]]:
     pool = get_pool_for_decorator(pool)
 
-    def wrapper_of_wrapper(function: Callable[[Any], Any]) -> Callable[[Any], Task]:
+    def wrapper_of_wrapper(function: Callable[[Any], Any]) -> Callable[..., Task]:
         @wraps(function)
         def wrapper(*args: Any, **kwargs: Any) -> Task:
             task = pool.do(function, *args, **kwargs)

awaits/task.py

@@ -2,7 +2,7 @@
 
 
 class Task:
-    def __init__(self, function: Callable[[Any], Any], *args: Any, **kwargs: Any) -> None:
+    def __init__(self, function: Callable[..., Any], *args: Any, **kwargs: Any) -> None:
         self.function: Callable[[Any], Any] = function
         self.args: Tuple[Any, ...] = args
         self.kwargs: Dict[str, Any] = kwargs

awaits/utils/end_of_wrappers.py

@@ -3,7 +3,7 @@
 from awaits.errors import IncorrectUseOfTheDecoratorError
 
 
-def end_of_wrappers(args: Tuple[Callable[[Any], Any], ...], wrapper: Callable[[Callable[[Any], Any]], Callable[[Any], Any]]) -> Union[Callable[[Callable[[Any], Any]], Callable[[Any], Any]], Callable[[Any], Any]]:
+def end_of_wrappers(args: Tuple[Callable[..., Any], ...], wrapper: Callable[[Callable[..., Any]], Callable[..., Any]]) -> Union[Callable[[Callable[..., Any]], Callable[..., Any]], Callable[..., Any]]:
     """
     Определяем, как вызван декоратор - как фабрика декораторов (т. е. без позиционных аргументов) или как непосредственный декоратор.
     """

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'awaits'
-version = '0.0.10'
+version = '0.0.11'
 authors = [
   { name='Evgeniy Blinov', email='zheni-b@yandex.ru' },
 ]