python-iterutils 0.0.4.3__tar.gz → 0.0.4.5__tar.gz

{python_iterutils-0.0.4.3 → python_iterutils-0.0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.0.4.3
+Version: 0.0.4.5
 Summary: Python another itertools.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils
 License: MIT

{python_iterutils-0.0.4.3 → python_iterutils-0.0.4.5}/iterutils/__init__.py

@@ -13,7 +13,7 @@ from collections.abc import (
     AsyncIterable, AsyncIterator, Awaitable, Callable, Generator, Iterable, Iterator, 
 )
 from inspect import isawaitable
-from typing import overload, Any, Literal, TypeVar
+from typing import Any, TypeVar
 
 from asynctools import async_zip, ensure_async, ensure_aiter
 
@@ -167,31 +167,13 @@ def cut_iter(
         yield stop, stop - start
 
 
-@overload
 def run_gen_step(
-    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
-    *, 
-    async_: Literal[False] = False, 
-    threaded: bool = False, 
-    as_iter: bool = False, 
-) -> T:
-    ...
-@overload
-def run_gen_step(
-    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
-    *, 
-    async_: Literal[True], 
-    threaded: bool = False, 
-    as_iter: bool = False, 
-) -> Awaitable[T]:
-    ...
-def run_gen_step(
-    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
+    gen_step: Generator[Any, Any, T] | Callable[[], Generator[Any, Any, T]], 
     *, 
     async_: bool = False, 
     threaded: bool = False, 
     as_iter: bool = False, 
-) -> T | Awaitable[T]:
+) -> T:
     if callable(gen_step):
         gen = gen_step()
         close = gen.close
@@ -209,9 +191,14 @@ def run_gen_step(
                     func = send(None)
                 while True:
                     try:
-                        ret = func()
-                        if isawaitable(ret):
-                            ret = await ret
+                        if isawaitable(func):
+                            ret = await func
+                        elif callable(func):
+                            ret = func()
+                            if isawaitable(ret):
+                                ret = await ret
+                        else:
+                            ret = func
                     except BaseException as e:
                         if threaded:
                             func = await to_thread(throw, e)
@@ -251,7 +238,7 @@ def run_gen_step(
             func = send(None)
             while True:
                 try:
-                    ret = func()
+                    ret = func() if callable(func) else ret
                 except BaseException as e:
                     func = throw(e)
                 else:

{python_iterutils-0.0.4.3 → python_iterutils-0.0.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-iterutils"
-version = "0.0.4.3"
+version = "0.0.4.5"
 description = "Python another itertools."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"