reykit 1.1.61__py3-none-any.whl → 1.1.62__py3-none-any.whl

reykit/rbase.py

@@ -901,7 +901,7 @@ def block() -> None:
                 print('End blocking.')
                 break
 
-            except:
+            except BaseException:
                 continue
 
 

reykit/rwrap.py

@@ -42,7 +42,7 @@ type Decorated = Callable
 type Decorator = Callable[..., Decorated]
 
 
-def wrap_wrap(decorator: Decorator) -> Decorator:
+def wrap_wrap(decorator: Decorator | None = None) -> Decorator:
     """
     Decorate decorator.
 
@@ -102,8 +102,13 @@ def wrap_wrap(decorator: Decorator) -> Decorator:
         Decorated function or decorated self.
         """
 
-        # Method one and three.
-        if func is not None:
+        # Has decorator parameter.
+        if func is None:
+            __wrap = functools_partial(_wrap, **wrap_kwargs)
+            return __wrap
+
+        # No decorator parameter.
+        else:
 
 
             @functools_wraps(func)
@@ -121,7 +126,7 @@ def wrap_wrap(decorator: Decorator) -> Decorator:
                 Function return.
                 """
 
-                # Decorate function.
+                # Excute.
                 result = decorator(func, args, kwargs, **wrap_kwargs)
 
                 return result
@@ -130,12 +135,6 @@ def wrap_wrap(decorator: Decorator) -> Decorator:
             return _func
 
 
-        # Method two and four.
-        else:
-            __wrap = functools_partial(_wrap, **wrap_kwargs)
-            return __wrap
-
-
     return _wrap
 
 
@@ -323,7 +322,7 @@ def wrap_exc(
 def wrap_retry(
     func: Callable[..., T],
     total: int = 1,
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any] | None = None,
+    handler: Callable[[tuple[str, BaseException, StackSummary]], Any] | None = None,
     exception: BaseException | tuple[BaseException, ...] = BaseException
 ) -> Callable[..., T]: ...
 
@@ -331,7 +330,7 @@ def wrap_retry(
 def wrap_retry(
     *,
     total: int = 1,
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any] | None = None,
+    handler: Callable[[tuple[str, BaseException, StackSummary]], Any] | None = None,
     exception: BaseException | tuple[BaseException, ...] = BaseException
 ) -> Callable[[Callable[..., T]], T]: ...
 
@@ -341,7 +340,7 @@ def wrap_retry(
     args: Any,
     kwargs: Any,
     total: int = 2,
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any] | None = None,
+    handler: Callable[[tuple[str, BaseException, StackSummary]], Any] | None = None,
     exception: BaseException | tuple[BaseException, ...] = BaseException
 ) -> T:
     """

{reykit-1.1.61.dist-info → reykit-1.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.61
+Version: 1.1.62
 Summary: Kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.61.dist-info → reykit-1.1.62.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=lmHLJbkmVOXTac5_zBPPirdjcPBekhswBmCXclIG11A,21684
+reykit/rbase.py,sha256=tMLDwFACHQN9SDK-1dsGIAXZGw6FSnKf_5-aZUFCFpg,21698
 reykit/rdata.py,sha256=NmOY_h4w2PY5xBbYNmOnb55w7PGsvvCzOBnxPjQ08qw,10293
 reykit/remail.py,sha256=l4HGKXdfHNBxyBT3YxeZyQhfecbElqTqSAGInwWhap8,6723
 reykit/rimage.py,sha256=lNN2iMpvSMqh-nPTpxrA9yHy43EA5WoYdxKYhqPwMgk,6154
@@ -18,11 +18,11 @@ reykit/rtable.py,sha256=YuDH2GL9Lwr5LljRDm5hzHrsvaXOs4-X89XVwFD-b0g,12221
 reykit/rtask.py,sha256=NUTngUUDUZy3TqEHiuiKy17FcE0F1zS118KnKTsBjng,22838
 reykit/rtext.py,sha256=cWHy19lDcJvpX7LU95kmRVsDimpAUaz5TbKC1h83gB4,13254
 reykit/rtime.py,sha256=8QJ6YNiC0JUDiW1xc1tkzQUMPYOFT7d7dKCYRuYt9co,17635
-reykit/rwrap.py,sha256=tB2UtF8wY7VW5C04AggmRfI67y4l5pDbgqqFO_fwg6g,15126
+reykit/rwrap.py,sha256=FEmeK_fboJ-OyXeJf8bilc7U2ph8xIbZGNHb6fLCy2c,15063
 reykit/rzip.py,sha256=BGEONswuBZxQ-zcgd_xp2fcvYesC9AmKaaXWvnT3bTI,3456
 reykit/rdll/__init__.py,sha256=nLSb8onBm2ilyoxzpDzUeGfSCKwkLEesIhzK3LiJ8mk,701
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.61.dist-info/METADATA,sha256=QCB9yw4xo648tFbldf6f3GfS3q4-q56QcFPsX_40xhY,1872
-reykit-1.1.61.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.61.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.61.dist-info/RECORD,,
+reykit-1.1.62.dist-info/METADATA,sha256=s4p04lHvez_YiMGAV6x3pttHztluRZcZ86SbzxcjATg,1872
+reykit-1.1.62.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.62.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.62.dist-info/RECORD,,