reykit 1.1.2__py3-none-any.whl → 1.1.6__py3-none-any.whl

reykit/rdata.py

@@ -9,11 +9,12 @@
 """
 
 
-from typing import Any, TypedDict, Literal, NoReturn, TypeVar, overload
+from typing import Any, TypedDict, Literal, overload
 from collections.abc import Callable, Iterable, Generator
 
 from .rexception import check_least_one, check_most_one
 from .rsystem import is_iterable
+from .rtype import AnyValue
 
 
 __all__ = (
@@ -28,7 +29,6 @@ __all__ = (
 
 
 CountResult = TypedDict('CountResult', {'value': Any, 'count': int})
-Element = TypeVar('Element')
 
 
 def count(
@@ -130,15 +130,12 @@ def flatten(data: Any, *, _flattern_data: list | None = None) -> list:
 
 
 @overload
-def split(data: Iterable[Element], share: None = None, bin_size: None = None) -> NoReturn: ...
+def split(data: Iterable[AnyValue], share: int = None, bin_size: None = None) -> list[list[AnyValue]]: ...
 
 @overload
-def split(data: Iterable[Element], share: int = None, bin_size: int = None) -> NoReturn: ...
+def split(data: Iterable[AnyValue], share: None = None, bin_size: int = None) -> list[list[AnyValue]]: ...
 
-@overload
-def split(data: Iterable[Element], share: int | None = None, bin_size: int | None = None) -> list[list[Element]]: ...
-
-def split(data: Iterable[Element], share: int | None = None, bin_size: int | None = None) -> list[list[Element]]:
+def split(data: Iterable[AnyValue], share: int | None = None, bin_size: int | None = None) -> list[list[AnyValue]]:
     """
     Split data into multiple data.
 
@@ -186,7 +183,7 @@ def split(data: Iterable[Element], share: int | None = None, bin_size: int | Non
     return _data
 
 
-def unique(data: Iterable[Element]) -> list[Element]:
+def unique(data: Iterable[AnyValue]) -> list[AnyValue]:
     """
     De duplication of data.
 

reykit/rlog.py

@@ -10,7 +10,7 @@
 
 
 from __future__ import annotations
-from typing import Any, Literal, Final, NoReturn, overload, override
+from typing import Any, Literal, Final, overload, override
 from collections.abc import Callable
 from queue import Queue
 from os.path import abspath as os_abspath
@@ -462,28 +462,6 @@ class RLog(object):
         filter_: Callable[[LogRecord], bool] | None = None
     ) -> ConcurrentTimedRotatingFileHandler: ...
 
-    @overload
-    def add_file(
-        self,
-        path: str | None = None,
-        mb: None = None,
-        time: Any = None,
-        level: int = DEBUG,
-        format_: str | None = None,
-        filter_: Callable[[LogRecord], bool] | None = None
-    ) -> NoReturn: ...
-
-    @overload
-    def add_file(
-        self,
-        path: str | None = None,
-        mb: float = None,
-        time: float | Literal['m', 'w0', 'w1', 'w2', 'w3', 'w4', 'w5', 'w6'] = None,
-        level: int = DEBUG,
-        format_: str | None = None,
-        filter_: Callable[[LogRecord], bool] | None = None
-    ) -> NoReturn: ...
-
     def add_file(
         self,
         path: str | None = None,

reykit/ros.py

@@ -10,7 +10,7 @@
 
 
 from __future__ import annotations
-from typing import Any, Literal, NoReturn, overload
+from typing import Any, Literal, overload
 from io import TextIOBase, BufferedIOBase
 from os import (
     walk as os_walk,
@@ -219,12 +219,6 @@ def get_file_str(file: FileStr) -> str:
     return file_str
 
 
-@overload
-def get_file_bytes(file: FileBytes) -> bytes: ...
-
-@overload
-def get_file_bytes(file: Any) -> NoReturn: ...
-
 def get_file_bytes(file: FileBytes) -> bytes:
     """
     Get file bytes data.

reykit/rsystem.py

@@ -208,7 +208,13 @@ def del_modules(path: str) -> list[str]:
     return deleted_dict
 
 
-def dos_command(command: str | Iterable[str]) -> str:
+@overload
+def dos_command(command: str | Iterable[str], read: False = False) -> None: ...
+
+@overload
+def dos_command(command: str | Iterable[str], read: True = False) -> str: ...
+
+def dos_command(command: str | Iterable[str], read: bool = False) -> str | None:
     """
     Execute DOS command.
 
@@ -218,26 +224,24 @@ def dos_command(command: str | Iterable[str]) -> str:
         - `str`: Use this command.
         - `Iterable[str]`: Join strings with space as command.
             When space in the string, automatic add quotation mark (e.g., ['echo', 'a b'] -> 'echo 'a b'').
+    read : Whether read command output, will block.
 
     Returns
     -------
-    Command standard output.
+    Command standard output or None.
     """
 
     # Execute.
-    popen = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
-
-    # Check.
-    error_bytes: bytes = popen.stderr.read()
-    if error_bytes != b'':
-        error = error_bytes.decode('GBK')
-        throw(value=error)
+    popen = Popen(command, stdout=PIPE, stderr=PIPE, shell=True)
 
-    # Standard output.
-    output_bytes: bytes = popen.stdout.read()
-    output = output_bytes.decode('GBK')
+    # Output.
+    if read:
+        stderr_bytes: bytes = popen.stderr.read()
+        stdout_bytes: bytes = popen.stdout.read()
+        output_bytes = stdout_bytes + stderr_bytes
+        output = output_bytes.decode('GBK')
 
-    return output
+        return output
 
 
 def dos_command_var(*vars: Any) -> list[Any]:
@@ -1265,6 +1269,10 @@ def popup_ask(
         - `Literal['yes_no_cancel']`: Buttons are `yes` and `no` and `cancel`.
     message : Ask box content.
     title : Ask box title.
+
+    Returns
+    -------
+    Ask result.
     """
 
     # Pop up.
@@ -1296,7 +1304,7 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> str: ...
+) -> str | None: ...
 
 @overload
 def popup_select(
@@ -1305,14 +1313,14 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> tuple[str, ...]: ...
+) -> tuple[str, ...] | None: ...
 
 @overload
 def popup_select(
     style: Literal['folder'] = 'file',
     title : str | None = None,
     init_folder : str | None = None
-) -> str: ...
+) -> str | None: ...
 
 def popup_select(
     style: Literal['file', 'files', 'folder', 'save'] = 'file',
@@ -1320,7 +1328,7 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> str | tuple[str, ...]:
+) -> str | tuple[str, ...] | None:
     """
     Pop up system select box.
 
@@ -1337,6 +1345,11 @@ def popup_select(
     filter_file : Filter file.
         - `tuple[str, str]`: Filter name and filter pattern.
         - `tuple[str, list[str]]`: Filter name and multiple filter patterns (or).
+
+    Returns
+    -------
+    File or folder path.
+        - `None`: Close select box.
     """
 
     # Pop up.
@@ -1370,5 +1383,6 @@ def popup_select(
             method = tkinter_asksaveasfilename
 
     path = method(**kwargs)
+    path = path or None
 
     return path

reykit/rtime.py

@@ -34,6 +34,7 @@ from .rnumber import digits
 from .rrandom import randn
 from .rregex import search
 from .rstdout import echo
+from .rtype import AnyValue
 
 
 __all__ = (
@@ -65,9 +66,6 @@ def now(format_: Literal['datetime_str', 'date_str', 'time_str'] = 'datetime') -
 @overload
 def now(format_: Literal['timestamp'] = 'datetime') -> int: ...
 
-@overload
-def now(format_: Any) -> NoReturn: ...
-
 def now(
     format_: Literal[
         'datetime',
@@ -134,10 +132,10 @@ def time_to(
 
 @overload
 def time_to(
-    obj: Any,
+    obj: AnyValue,
     decimal: bool = False,
     raising: Literal[False] = True
-) -> Any: ...
+) -> AnyValue: ...
 
 def time_to(
     obj: Any,
@@ -328,9 +326,9 @@ def to_time(
 
 @overload
 def to_time(
-    obj: Any,
+    obj: AnyValue,
     raising: Literal[False] = True
-) -> Any: ...
+) -> AnyValue: ...
 
 def to_time(
     obj: Any,
@@ -433,10 +431,11 @@ def wait(
     *args: Any,
     _interval: float = 1,
     _timeout: float | None = None,
+    _raising: bool = True,
     **kwargs: Any
-) -> float:
+) -> float | None:
     """
-    Wait success, timeout throw exception.
+    Wait success.
 
     Parameters
     ----------
@@ -446,11 +445,12 @@ def wait(
     _timeout : Timeout seconds, timeout throw exception.
         - `None`: Infinite time.
         - `float`: Use this time.
+    _raising : When timeout, whether throw exception, otherwise return None.
     kwargs : Keyword arguments of decorated function.
 
     Returns
     -------
-    Total spend seconds.
+    Total spend seconds or None.
     """
 
     # Set parameter.
@@ -477,7 +477,12 @@ def wait(
             ## Timeout.
             rtm()
             if rtm.total_spend > _timeout:
-                throw(TimeoutError, _timeout)
+
+                ### Throw exception.
+                if _raising:
+                    throw(TimeoutError, _timeout)
+
+                return
 
             ## Sleep.
             sleep(_interval)

reykit/rtype.py

@@ -9,11 +9,12 @@
 """
 
 
-from typing import Any, Self
+from typing import Any, Self, TypeVar
 from collections.abc import Callable
 
 
 __all__ = (
+    'AnyValue',
     'RStaticMeta',
     'RConfigMeta',
     'RNull',
@@ -21,6 +22,9 @@ __all__ = (
 )
 
 
+AnyValue = TypeVar('AnyValue')
+
+
 class RStaticMeta(type):
     """
     Rey's `static meta` type.

{reykit-1.1.2.dist-info → reykit-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.2
+Version: 1.1.6
 Summary: Rey's kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.2.dist-info → reykit-1.1.6.dist-info}/RECORD

@@ -1,30 +1,30 @@
 reykit/__init__.py,sha256=QwnhdUDSXgjXJQ4ClaeP9oKXUXyQOPj5sApwGCDrILc,848
 reykit/rall.py,sha256=mOFwHXZ4-BOkJ5Ptbm6lQc2zwNf_VqcqM6AYYnYPfoo,672
 reykit/rcomm.py,sha256=LgSLrpUokOgdRMYwuZj6JNvxDyvENwsiOd6ZHo67HBg,11444
-reykit/rdata.py,sha256=d5zO9dQotDGoXxNh1TvEZdIfacaW55yeb79r0bbgj0k,8470
+reykit/rdata.py,sha256=tlHpKB3px5KCxhA_rgu_nYOGjHkyJTLqqRlX9UypGR0,8348
 reykit/remail.py,sha256=rK_hbqGeZh04DnVPtjODLsm_YfdrZ5L-Z6SbjplrfUc,6736
 reykit/rexception.py,sha256=ftXVdEVkU0B0HXbKjQTiJRJVVGbvhorwWtMiplpN9Zk,8118
 reykit/rimage.py,sha256=fQpIHX6Go3Jk_MDgsSDnZx27EZHumyGdgI9xyjP5lYQ,6275
-reykit/rlog.py,sha256=4RqfYU7RZJJ3qUXHUTWFVgAM3nqjP4glDyRmvWNXpbk,26406
+reykit/rlog.py,sha256=qhmATMv3_bJRaiuN9mo8hSf_95HH5Lw838aJFio98sg,25760
 reykit/rmonkey.py,sha256=RqhmKXabl11s2RJaGizpm00Q1yEkul1Je5uxw8_thUk,7584
 reykit/rmultitask.py,sha256=9UVAg8P85UsLS_exW-e6tZTa_b5r3ceL7LQRDrP8eAw,21981
 reykit/rnumber.py,sha256=XseLDNLDOt-XYP2P9oDbkKYuHudeSoWzIHsOENO8vvE,3196
-reykit/ros.py,sha256=flnczS5InFd9rVdXNi-amVETlIu1nwZPWSGySLMOPLw,39231
+reykit/ros.py,sha256=UXX7FENgVCTR8m6-53CxzJvmPzHIzC7vLK2vyrkySiw,39096
 reykit/rrandom.py,sha256=fMeorpkjWAAtjD2oZCux3tpYuD2RRoBSkWI0M6NPM5Q,9102
 reykit/rregex.py,sha256=XTlnDLior8yyncFdrTr9FsVlBcqMXvsWRfpmvQS-BR8,6089
 reykit/rschedule.py,sha256=7EH_6TdEhwV-T6YyBEGYEcy85I1vTSNutDci-e_veTY,5796
 reykit/rstdout.py,sha256=vSvD4QjYybNiGnowWLXRU6q1u9ERPjr8YTXgq82eYDU,9648
-reykit/rsystem.py,sha256=LG0I4ZZjr-Bxfy6zbCqz3WvSG_bGYwtaBLowTHQ0mzY,34332
+reykit/rsystem.py,sha256=XD5-kjJ0Dx1ONLknbAGt5VRCOYjBPc8qs0bTxt_Lxb0,34754
 reykit/rtable.py,sha256=gXszf_9DE_5SMdNcxMX-xd4IpHGQVjGsN3NQIm7wVGY,12055
 reykit/rtext.py,sha256=whaKpVkd36yYVtCmZ1ptp_TVRL1v3f7Jab0vPXC8wXY,11089
-reykit/rtime.py,sha256=bV1sB_FHcqNJAP9L7WmYMZul3HrQM2QU9a2Q1zN98Aw,16980
-reykit/rtype.py,sha256=HQFllZjKHPnGYLS-zTwC948Rt0HVsGY12eObjwFfOSo,1962
+reykit/rtime.py,sha256=z468hEtU2gP6PRUFGgazf0EAVk6DhUy8LRvwLMjUZ_w,17172
+reykit/rtype.py,sha256=Hg_LkyGpxLHbj5xwtJOwaqaS6WFwQZifXdC0n0mwhgY,2024
 reykit/rwrap.py,sha256=AJBYTDLHLGlMSiGIKoVkCsQk-Y4nDHWWFVCdnz5Bwdk,15222
 reykit/rzip.py,sha256=i6KkmeSWCnq025d-O1mbuCYezNRUhyY9OGVK0CRlNAM,3522
 reykit/rdll/__init__.py,sha256=vM9V7wSNno-WH9RrxgHTIgCkQm8LmBFoLFO8z7qovNo,306
 reykit/rdll/rdll_inject.py,sha256=bETl8tywtN1OiQudbA21u6GwBM_bqVX7jbiisNj_JBg,645
 reykit/rdll/rdll_inject_core.py,sha256=Trgh_pdJs_Lw-Y-0Kkn8kHr4BnilM9dBKnHnX25T_pM,5092
-reykit-1.1.2.dist-info/METADATA,sha256=2PvdTJEz7npFsQ53sEkQD4f8k7xHYLDAPZS81xxHQhM,1888
-reykit-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.2.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.2.dist-info/RECORD,,
+reykit-1.1.6.dist-info/METADATA,sha256=lH3vUQkbSiXiD4YWYxCcg1Q7_91KBGSINZL4Q1lblBU,1888
+reykit-1.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.6.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.6.dist-info/RECORD,,