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

reykit/rbase.py

@@ -10,11 +10,10 @@
 
 
 from typing import Any, Literal, Self, TypeVar, NoReturn, overload
-from types import TracebackType
 from collections.abc import Callable, Iterable, Container, Mapping
 from sys import exc_info as sys_exc_info
 from os.path import exists as os_exists
-from traceback import format_exc
+from traceback import StackSummary, format_exc, extract_tb
 from warnings import warn as warnings_warn
 from traceback import format_stack, extract_stack
 from atexit import register as atexit_register
@@ -36,7 +35,7 @@ __all__ = (
     'Singleton',
     'Null',
     'null',
-    'BaseError',
+    'ErrorBase',
     'Exit',
     'Error',
     'throw',
@@ -213,19 +212,19 @@ class Null(Singleton):
 null = Null()
 
 
-class BaseError(Base, BaseException):
+class ErrorBase(Base, BaseException):
     """
     Base error type.
     """
 
 
-class Exit(BaseError):
+class Exit(ErrorBase):
     """
     Exit type.
     """
 
 
-class Error(BaseError):
+class Error(ErrorBase):
     """
     Error type.
     """
@@ -337,42 +336,25 @@ def warn(
     warnings_warn(infos, exception, stacklevel)
 
 
-def catch_exc(
-    title: str | None = None
-) -> tuple[str, type[BaseException], BaseException, TracebackType]:
+def catch_exc() -> tuple[str, BaseException, StackSummary]:
     """
-    Catch exception information and print, must used in `except` syntax.
-
-    Parameters
-    ----------
-    title : Print title.
-        - `None`: Not print.
-        - `str`: Print and use this title.
+    Catch or print exception data, must used in `except` syntax.
 
     Returns
     -------
     Exception data.
-        - `str`: Exception report text.
-        - `type[BaseException]`: Exception type.
+        - `str`: Exception traceback text of from `try` to exception.
         - `BaseException`: Exception instance.
-        - `TracebackType`: Exception traceback instance.
+        - `StackSummary`: Exception traceback stack instance.
     """
 
     # Handle parameter.
-    exc_report = format_exc()
-    exc_report = exc_report.strip()
-    exc_type, exc_instance, exc_traceback = sys_exc_info()
-
-    # Print.
-    if title is not None:
-
-        ## Import.
-        from .rstdout import echo
-
-        ## Execute.
-        echo(exc_report, title=title, frame='half')
+    exc_text = format_exc()
+    exc_text = exc_text.strip()
+    _, exc, traceback = sys_exc_info()
+    stack = extract_tb(traceback)
 
-    return exc_report, exc_type, exc_instance, exc_traceback
+    return exc_text, exc, stack
 
 
 @overload
@@ -919,7 +901,7 @@ def block() -> None:
                 print('End blocking.')
                 break
 
-            except:
+            except BaseException:
                 continue
 
 

reykit/rlog.py

@@ -771,7 +771,7 @@ class Log(Base):
             level is None
             or catch
         ):
-            exc_report, exc_type, *_ = catch_exc()
+            exc_text, exc, _ = catch_exc()
 
         ## Messages.
         messages_len = len(messages)
@@ -780,7 +780,7 @@ class Log(Base):
 
         ## Level.
         if level is None:
-            if exc_type is None:
+            if exc is None:
                 level = self.INFO
             else:
                 level = self.ERROR
@@ -798,11 +798,11 @@ class Log(Base):
         ### Exception.
         if (
             catch
-            and exc_type is not None
+            and exc is not None
         ):
             messages = '%s\n%s' % (
                 messages,
-                exc_report
+                exc_text
             )
 
         # Record.

reykit/rrand.py

@@ -11,7 +11,6 @@
 
 from __future__ import annotations
 from typing import Literal, Self, overload
-from types import TracebackType
 from collections.abc import Sequence
 from string import digits as string_digits, ascii_letters as string_ascii_letters, punctuation as string_punctuation
 from math import ceil as math_ceil
@@ -112,18 +111,10 @@ class RandomSeed(Base):
 
     def __exit__(
         self,
-        exc_type: type[BaseException] | None,
-        exc_instance: BaseException | None,
-        exc_traceback: TracebackType | None
+        *_
     ) -> None:
         """
         Exit syntax `with`.
-
-        Parameters
-        ----------
-        exc_type : Exception type.
-        exc_instance : Exception instance.
-        exc_traceback : Exception traceback instance.
         """
 
         # Delete.

reykit/rwrap.py

@@ -10,9 +10,9 @@
 
 
 from typing import Any, Literal, overload
-from types import TracebackType
 from collections.abc import Callable
 from io import IOBase, StringIO
+from traceback import StackSummary
 from inspect import getdoc as inspect_getdoc
 from functools import wraps as functools_wraps, partial as functools_partial
 from datetime import datetime as Datetime, timedelta as Timedelta
@@ -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
 
 
@@ -271,14 +270,14 @@ def wrap_thread(
 @overload
 def wrap_exc(
     func: Callable[..., T],
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any],
+    handler: Callable[[str, BaseException, StackSummary], Any],
     exception: BaseException | tuple[BaseException, ...] | None = BaseException
 ) -> Callable[..., T | None]: ...
 
 @overload
 def wrap_exc(
     *,
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any],
+    handler: Callable[[str, BaseException, StackSummary], Any],
     exception: BaseException | tuple[BaseException, ...] | None = BaseException
 ) -> Callable[[Callable[..., T]], T | None]: ...
 
@@ -287,7 +286,7 @@ def wrap_exc(
     func: Callable[..., T],
     args: Any,
     kwargs: Any,
-    handler: Callable[[tuple[str, type[BaseException], BaseException, TracebackType]], Any],
+    handler: Callable[[str, BaseException, StackSummary], Any],
     exception: BaseException | tuple[BaseException, ...] | None = BaseException
 ) -> T | None:
     """
@@ -312,8 +311,8 @@ def wrap_exc(
 
     # Handle exception.
     except exception:
-        exc_report, exc_type, exc_instance, exc_traceback = catch_exc()
-        handler(exc_report, exc_type, exc_instance, exc_traceback)
+        exc_text, exc, stack = catch_exc()
+        handler(exc_text, exc, stack)
 
     else:
         return result
@@ -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:
     """
@@ -371,8 +370,8 @@ def wrap_retry(
         ## Handle.
         except exception:
             if handler is not None:
-                exc_report, exc_type, exc_instance, exc_traceback = catch_exc()
-                handler(exc_report, exc_type, exc_instance, exc_traceback)
+                exc_text, exc, stack = catch_exc()
+                handler(exc_text, exc, stack)
 
         else:
             return result

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.60
+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.60.dist-info → reykit-1.1.62.dist-info}/RECORD

@@ -1,15 +1,15 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=EfTMt6cRTfHlVXLX9D87lI8x6NEMfyX9IJP0WxBRkQg,22098
+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
-reykit/rlog.py,sha256=5VWQArgXcbZykyVqBf5q6Q1yz39sF6_pRHPyFPqluXY,25765
+reykit/rlog.py,sha256=TRAWaVG9KTgzeNjN-FXkcvBmvq1IhICgawllQEGoUdg,25745
 reykit/rmonkey.py,sha256=Dj2GBzBDFXbo0Z-5f8Zep4dfbaIw1bo1FUmC31xvDuk,7929
 reykit/rnet.py,sha256=6uULgoPk8DTKWg9yNQco7gdw4A59F9ygcZR6rgO4eoY,16897
 reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
 reykit/ros.py,sha256=8bLvjt0WkUPF6bkwQnm4xeoZTeKqcwM3a0EFt51WNaU,47006
-reykit/rrand.py,sha256=bYYmuKNqn4un1i-SdA9jb9l1iYaeLfS-tWJRzD3gLDs,8941
+reykit/rrand.py,sha256=4VwooITgox54_GonELcJfcIpStDi-UJchpnyWKnyeIA,8606
 reykit/rre.py,sha256=1qva7xatKVE9qC2j7IujjXSM59qxHWwTYpiizFFQ8Xo,6024
 reykit/rschedule.py,sha256=E2gRLrCwrAo2CV1sOHrWoaVP99Wq7QjAqeYv04hWsYo,5767
 reykit/rstdout.py,sha256=yesWo7wIGablpyAu-2J2Gw11Qp3GdQjGICTyIcvLyt4,8200
@@ -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=UaMkBx3tTtFlqCGe7no6VmOIFnnuxNKcmIsAAThZUVs,15326
+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.60.dist-info/METADATA,sha256=TU0Fx69ZyiMxnW8NMm1lmBYp5a-8AM0P_Bf9oJu5eQI,1872
-reykit-1.1.60.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.60.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.60.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,,