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

ezKit/utils.py

@@ -7,14 +7,12 @@ import os
 import subprocess
 import time
 import tomllib
+from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor
 from copy import deepcopy
 from itertools import islice
-from multiprocessing import Pool
-from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from shutil import rmtree
-from types import FunctionType
-from typing import Any
+from typing import Any, Callable
 from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
@@ -742,7 +740,7 @@ def parent_dir(
 # --------------------------------------------------------------------------------------------------
 
 
-def retry(func: FunctionType, times: int = 3, **kwargs):
+def retry(func: Callable, times: int = 3, **kwargs) -> Any:
     """重试"""
 
     # 函数传递参数: https://stackoverflow.com/a/803632
@@ -1191,12 +1189,12 @@ def delete_directory(
 
 
 def processor(
-    process_func: FunctionType,
-    process_data: list[Any],
+    process_func: Callable,
+    process_data: list,
     process_num: int = 2,
     thread: bool = False,
     **kwargs
-) -> list | bool:
+) -> Any:
     """使用多线程或多进程对数据进行并行处理"""
 
     # :param process_func: 处理函数
@@ -1226,13 +1224,13 @@ def processor(
 
         # 确保并行数不超过数据量
         process_num = min(len(process_data), process_num)
-        _data_chunks = (
+        data_chunks = (
             list_split(process_data, process_num, equally=True)
             if process_num > 1
             else [process_data]
         )
 
-        if not _data_chunks:
+        if not data_chunks:
             logger.error("data chunks error")
             return False
 
@@ -1241,9 +1239,9 @@ def processor(
         )
 
         # 执行多线程或多进程任务
-        pool_cls = ThreadPool if thread else Pool
-        with pool_cls(process_num, **kwargs) as pool:
-            return pool.map(process_func, _data_chunks)
+        pool = ThreadPoolExecutor if thread else ProcessPoolExecutor
+        with pool(process_num, **kwargs) as executor:
+            return executor.map(process_func, data_chunks)
 
     except Exception as e:
         logger.exception(e)

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

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

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

@@ -10,10 +10,10 @@ ezKit/qywx.py,sha256=dGChIIf2V81MwufcPn6hwgSenPuxqK994KRH7ECT-CM,10387
 ezKit/redis.py,sha256=tdiqfizPYQQTIUumkJGUJsJVlv0zVTSTYGQN0QutYs4,1963
 ezKit/sendemail.py,sha256=47JTDFoLJKi0YtF3RAp9nFfo0ko2jlde3R_C1wr2E2w,7397
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=cIoiqZXJkbdo0FtBEExOgA8jvyzjp1Yq0kvTFTc1kjs,42486
+ezKit/utils.py,sha256=Mwqc6YO7_G-2ctPc7QzWzPvNtvVF5dURddBpuGnqKEg,42465
 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,,
+ezKit-1.11.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.11.5.dist-info/METADATA,sha256=HJXiI2z5EuVlZXuWgw5CTQEBoXD8Hat1EZOpJk9IFDI,191
+ezKit-1.11.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.11.5.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.11.5.dist-info/RECORD,,