ezKit 1.11.3__py3-none-any.whl → 1.11.4__py3-none-any.whl

ezKit/bottle_extensions.py

@@ -1,10 +1,11 @@
 """Bottle Extensions"""
-from typing import Callable
+from types import FunctionType
+from typing import Any
 
 from . import bottle, utils
 
 
-def enable_cors(fn: Callable) -> Callable:
+def enable_cors(fn: FunctionType) -> Any | None:
     """Bottle CORS"""
     # 参考文档:
     # - https://stackoverflow.com/a/17262900

ezKit/sendemail.py

@@ -6,7 +6,7 @@ from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import formataddr, parseaddr
-from typing import Optional, TypedDict, cast
+from typing import TypedDict, cast
 
 from loguru import logger
 
@@ -28,9 +28,10 @@ class TypedSender(TypedDict):
 class TypedBody(TypedDict, total=False):
     """body type"""
     content: str
-    type: Optional[str]
+    type: str | None  # "plain", "html", or "file"
 
 def format_parse(s):
+    """格式化邮件地址"""
     _name, _addr = parseaddr(s)
     return formataddr((Header(_name, "utf-8").encode(), _addr))
 
@@ -42,33 +43,33 @@ def sendemail(
     body: TypedBody,
     images: None | list = None
 ) -> bool:
-    """
-    smtp SMTP信息
-
-        server  SMTP地址
-        port    SMTP端口
-        tls     是否使用TLS
-
-    sender 发件人信息
-
-        name     发件人名称
-        address  发件人邮箱地址
-        password 发件人邮箱密码(SMTP)
-
-    recipients  收件人(或列表)
-
-    subject     邮件主题
-
-    body        邮件主体
-
-        content 内容
-        type    类型 (默认 plain, 或者 file, 或者 html)
-
-    images 图片列表(可选)
-
-        cid  图片CID
-        path 图片路径
-    """
+    """发送邮件"""
+
+    # smtp SMTP信息
+    #
+    #     server  SMTP地址
+    #     port    SMTP端口
+    #     tls     是否使用TLS
+    #
+    # sender 发件人信息
+    #
+    #     name     发件人名称
+    #     address  发件人邮箱地址
+    #     password 发件人邮箱密码(SMTP)
+    #
+    # recipients  收件人(或列表)
+    #
+    # subject     邮件主题
+    #
+    # body        邮件主体
+    #
+    #     content 内容
+    #     type    类型 (默认 plain, 或者 file, 或者 html)
+    #
+    # images 图片列表(可选)
+    #
+    #     cid  图片CID
+    #     path 图片路径
 
     logger.success("sendemail start")
 

ezKit/utils.py

@@ -13,7 +13,8 @@ from multiprocessing import Pool
 from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from shutil import rmtree
-from typing import Any, Callable, List, Optional, Union
+from types import FunctionType
+from typing import Any
 from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
@@ -23,7 +24,7 @@ from loguru import logger
 
 
 # None Type
-NoneType = type(None)
+# from types import NoneType
 
 
 # --------------------------------------------------------------------------------------------------
@@ -741,7 +742,7 @@ def parent_dir(
 # --------------------------------------------------------------------------------------------------
 
 
-def retry(func: Callable, times: int = 3, **kwargs):
+def retry(func: FunctionType, times: int = 3, **kwargs):
     """重试"""
 
     # 函数传递参数: https://stackoverflow.com/a/803632
@@ -1005,9 +1006,9 @@ def shell(
     command: str,
     isfile: bool = False,
     sh_shell: str = "/bin/bash",
-    sh_option: Optional[str] = None,
+    sh_option: str | None = None,
     **kwargs
-) -> Optional[subprocess.CompletedProcess]:
+) -> subprocess.CompletedProcess | None:
     """执行 Shell 命令 或 脚本"""
 
     # :param command: 需要执行的命令
@@ -1100,7 +1101,7 @@ def json_sort(
 
 
 def delete_files(
-    files: Union[str, List]
+    files: str | list
 ) -> bool:
     """删除文件"""
     try:
@@ -1132,7 +1133,7 @@ def delete_files(
 
 
 def delete_directory(
-    directory: Union[str, List]
+    directory: str | list,
 ) -> bool:
     """
     delete directory
@@ -1190,12 +1191,12 @@ def delete_directory(
 
 
 def processor(
-    process_func: Callable,
-    process_data: List[Any],
+    process_func: FunctionType,
+    process_data: list[Any],
     process_num: int = 2,
     thread: bool = False,
     **kwargs
-) -> Union[List[Any], bool]:
+) -> list | bool:
     """使用多线程或多进程对数据进行并行处理"""
 
     # :param process_func: 处理函数

ezKit/xftp.py

@@ -10,7 +10,15 @@ from loguru import logger
 class XFTP:
     """XFTP"""
 
-    def __init__(self, host="127.0.0.1", port=21, username="anonymous", password="", encoding="UTF-8", debuglevel=0):
+    def __init__(
+        self,
+        host: str = "127.0.0.1",
+        port: int = 21,
+        username: str = "anonymous",
+        password: str = "",
+        encoding: str = "UTF-8",
+        debuglevel: int = 0
+    ):
         """Initiation"""
         self.ftp = FTP()
         self.ftp.set_debuglevel(debuglevel)

{ezKit-1.11.3.dist-info → ezKit-1.11.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.3
+Version: 1.11.4
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezKit-1.11.3.dist-info → ezKit-1.11.4.dist-info}/RECORD

@@ -1,19 +1,19 @@
 ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
-ezKit/bottle_extensions.py,sha256=3reEQVZuHklXTl6r7F8kiBFFPb0RaAGc3mYJJnrMDjQ,1129
+ezKit/bottle_extensions.py,sha256=CwXKxVKxxtbyfeeOSp2xODUqJBo7ro2C88H9sUOVDJI,1161
 ezKit/cipher.py,sha256=0T_StbjiNI4zgrjVgcfU-ffKgu1waBA9UDudAnqFcNM,2896
 ezKit/database.py,sha256=r5YNoEzeOeVTlEWI99xXtHTmPZ73_DopS8DTzZk8Lts,12432
 ezKit/http.py,sha256=ysXzqXFi9zmuVKINbYGwmf9Q5xDVW_DZWrSh6HSVq8M,1800
 ezKit/mongo.py,sha256=l3jRMmoGrTm16OG4daSCn0JLU1nbYAmTtHokwjLXzoA,2390
 ezKit/qywx.py,sha256=dGChIIf2V81MwufcPn6hwgSenPuxqK994KRH7ECT-CM,10387
 ezKit/redis.py,sha256=tdiqfizPYQQTIUumkJGUJsJVlv0zVTSTYGQN0QutYs4,1963
-ezKit/sendemail.py,sha256=tRXCsJm_RfTJ9xEWe_lTQ5kOs2JxHGPXvq0oWA7prq0,7263
+ezKit/sendemail.py,sha256=47JTDFoLJKi0YtF3RAp9nFfo0ko2jlde3R_C1wr2E2w,7397
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=a2RiwOjO83Wi4GmyBRLI1UreaVgNLL66Snbq0HnI37c,42501
-ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.11.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.11.3.dist-info/METADATA,sha256=DdwCdJ3vRgC-lWWRYXxG7viLD_44xAkZQVngFvwEFlk,191
-ezKit-1.11.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.11.3.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.11.3.dist-info/RECORD,,
+ezKit/utils.py,sha256=cIoiqZXJkbdo0FtBEExOgA8jvyzjp1Yq0kvTFTc1kjs,42486
+ezKit/xftp.py,sha256=izUH9pLH_AzgR3c0g8xSfhLn7LQ9EDcTst3LFjTM6hU,7878
+ezKit-1.11.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.11.4.dist-info/METADATA,sha256=amy4gY1s9zrVATfy2KKD0EI2xuPfTBXlBOV_1SM324g,191
+ezKit-1.11.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.11.4.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.11.4.dist-info/RECORD,,