upplib 3.4.0__py3-none-any.whl → 3.4.2__py3-none-any.whl

upplib/datetime_function.py

@@ -37,14 +37,12 @@ def get_tz(tz_info: Union[str, timezone]) -> timezone:
     raise ValueError(f"不支持的时区格式: {tz_info}")
 
 
-def to_datetime(
-        s: Any = None,
-        pattern: str = None,
-        r_str: bool = False,
-        error_is_none: bool = False,
-        tz: Optional[Union[str, timezone]] = None,
-        default_tz: Union[str, timezone] = None
-) -> Union[datetime, str, None]:
+def to_datetime(s: Any = None,
+                pattern: str = None,
+                r_str: bool = False,
+                error_is_none: bool = False,
+                tz: Optional[Union[str, timezone]] = None,
+                default_tz: Union[str, timezone] = None) -> Union[datetime, str, None]:
     """
     将字符串或时间戳转换为 datetime 对象，支持时区处理。
     error_is_none : 当发生错误的时候，是否返回 None
@@ -146,7 +144,10 @@ def to_datetime_str(s: Any = None,
                     default_tz: Union[str, timezone] = None) -> datetime | str:
     """
     将 s 先转成 datetime, 然后再转成字符串
-
+    :type pattern: str
+    :type pattern_str: str
+    :type tz: str
+    :type default_tz: str
     :param s: 输入值（可以是字符串或其他类型）
     """
     r_s = to_datetime(s, pattern=pattern, tz=tz, r_str=False, default_tz=default_tz)
@@ -218,8 +219,7 @@ def get_timestamp(s: Any = None) -> int:
 
 def get_datetime_number_str(s: Any = None,
                             length: int = None,
-                            remove_dz: bool = True,
-                            ) -> str:
+                            remove_dz: bool = True) -> str:
     """获取 datetime , 然后转成字符串, 然后, 只保留数字
         Args:
             s: 输入值，可以是任何类型，如果是None则使用当前时间
@@ -230,11 +230,11 @@ def get_datetime_number_str(s: Any = None,
         """
     s1 = to_datetime(s)
     digits_only = re.sub(r'\D', '', str(s1))
-    # 如果指定了长度，取最后length位
-    if length is not None and length > 0:
-        return digits_only[-length:] if len(digits_only) > length else digits_only
     if len(digits_only) > 4 and remove_dz:
         digits_only = digits_only[:-4]
+    # 如果指定了长度，取最后length位
+    if length is not None and length > 0:
+        digits_only = digits_only[-length:] if len(digits_only) > length else digits_only
     return digits_only
 
 

upplib/util.py

@@ -1,5 +1,6 @@
 from upplib import *
 from upplib.file_function import *
+from upplib.file_to_text import *
 from datetime import datetime, timezone, timedelta
 from typing import Any, Optional, Union, Callable, List
 

{upplib-3.4.0.dist-info → upplib-3.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upplib
-Version: 3.4.0
+Version: 3.4.2
 Summary: util
 Author: Luck
 Author-email: wantwaterfish@gmail.com

{upplib-3.4.0.dist-info → upplib-3.4.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ upplib/chart_html.py,sha256=39CTD2LbN7LNN3wtb3n-ojN2r_X7RJMWappPgiLSJG4,23144
 upplib/clean_up_msg.py,sha256=yR4D2fIXOT8z9VpClfhBjVnjhexObgNZDhvPu5v_5Y4,19237
 upplib/common_package.py,sha256=2-u66k4WbZnX6-PUaYy8wsblnz41nvtX4Hwo3J5hjO0,832
 upplib/config_data.py,sha256=KuRh0chqILL-2jXOUngVqjFMzkNZ0QFo_EVpBtptMuc,2757
-upplib/datetime_function.py,sha256=ISey6W5qUPK5dpwo15HnZhUN9JScJZcfNjKlkknUUO8,9381
+upplib/datetime_function.py,sha256=98ro3cV0fvHVoUIHRSv7bvVecBXSrnkqEiP1WhJCwTU,9481
 upplib/db.py,sha256=-3ZALQSzP92-zIhye6ckrXIctbHsVmwoLiCVOlTyDyo,7058
 upplib/file_function.py,sha256=OtVGnmUPd7UO6OJgZjlLgzGMXlftGt94o-_C6-aG2k8,10407
 upplib/file_to_text.py,sha256=P1HHAZDYlJ23jnd0ZU4-JnBDL9l3-bUKjq4kNTXGFH0,26798
@@ -18,9 +18,9 @@ upplib/multi_thread.py,sha256=zOeWG5HGYIzwqiPvef-4ak5bzorf0S3q6Ht8wPit_M0,2705
 upplib/query_log.py,sha256=BAUAVr3lA_GbDzHNjI5beJPs0ngNmy2gCi5Q6UMdr1s,9238
 upplib/redis_tool.py,sha256=I1kOqBwfQWVIOAY-hQaaOn1Zrx8BNlK83u-pk4uHPCA,707
 upplib/text_to_file.py,sha256=a9Fqj1voOZWn2n74IIBjM6CDS62cNyGfB9BRX_m7imo,14918
-upplib/util.py,sha256=dSoJjrpm8eWUyvA8Zv2KxQa117U-rbJrEGl7sMA7SJs,4637
-upplib-3.4.0.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-3.4.0.dist-info/METADATA,sha256=T4UxxX_nHdrHbo8doRio0sVgDBOGnh0E6WZ6sKviMFQ,940
-upplib-3.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-upplib-3.4.0.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-3.4.0.dist-info/RECORD,,
+upplib/util.py,sha256=K9OAjsbR2R3k0WWPXWWCphxYc25wbPHrW75pweGUSW4,4671
+upplib-3.4.2.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.4.2.dist-info/METADATA,sha256=wHDVXtMoW0y6TfMruGDquFkPH9mI-ksVyFOD1VMJcyA,940
+upplib-3.4.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.4.2.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.4.2.dist-info/RECORD,,