upplib 3.4.1__tar.gz → 3.4.2__tar.gz

{upplib-3.4.1 → upplib-3.4.2}/PKG-INFO

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

{upplib-3.4.1 → upplib-3.4.2}/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-3.4.1 → upplib-3.4.2}/upplib.egg-info/PKG-INFO

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