mytype

Author: joyguoguo

fuzz/command_util.py

@@ -4,17 +4,17 @@
 import logging
 import time
 from pathlib import Path
-from typing import Optional, Tuple, List
+from typing import Optional
 from returns.maybe import Maybe
 from errors import CommandError
 
 def _run_subprocess(
     cmd: str,
-    cwd: Optional[Path] = None,  # 修复：添加 Optional 类型
+    cwd: Optional[Path] = None,  
     capture_output: bool = False,
-    timeout: Optional[int] = None,  # 修复：添加 Optional 类型
-    logger: Optional[logging.Logger] = None,  # 修复：添加 Optional 类型
-) -> Tuple[int, List[str]]:  # 建议使用 Tuple 替代 tuple
+    timeout: Optional[int] = None,  
+    logger: Optional[logging.Logger] = None,  
+) -> tuple[int, list[str]]:  
     """
     低层执行子进程命令
     - capture_output=True：捕获 stdout，返回输出列表
@@ -33,12 +33,12 @@ def _run_subprocess(
         errors="replace",
     )
 
-    output_lines: List[str] = []
+    output_lines: list[str] = []
     start_time = time.time()
 
     try:
         if capture_output:
-            # 确保 stdout 不是 None
+           
             if process.stdout is None:
                 raise RuntimeError("stdout is unexpectedly None in capture mode")
 
@@ -52,7 +52,7 @@ def _run_subprocess(
                 elif process.poll() is not None:
                     break
 
-                # 处理超时逻辑
+                # Handle timeout logic
                 if timeout and (time.time() - start_time) > timeout:
                     if logger:
                         logger.error(f"⌛ 命令超时，耗时 {timeout} 秒")
@@ -64,7 +64,7 @@ def _run_subprocess(
                     return -1, output_lines
                 time.sleep(0.05)
         else:
-            # 不捕获输出，直接等待结束
+        
             process.wait(timeout=timeout)
 
     except Exception as e:
@@ -80,7 +80,7 @@ def run_command_build_fuzz(
     cmd: str,
     oss_fuzz_dir: Path,
     project: str = "",
-    allowed_exit_codes: Maybe[List[int]] = Maybe.empty,
+    allowed_exit_codes: Maybe[list[int]] = Maybe.empty,
     skip_yes: bool = False
 ) -> int:
     """build_fuzz.py 中使用的 run_command，简化版，抛异常"""
@@ -99,7 +99,7 @@ def run_command_fuzz_all_targets(
     cmd: str,
     log_msg: str,
     logger: logging.Logger,
-    allowed_exit_codes: Maybe[List[int]] = Maybe.empty,
+    allowed_exit_codes: Maybe[list[int]] = Maybe.empty,
     timeout: int = 3600,
 ) -> bool:
     """run_fuzz_all_targets_print1.py 中使用，带实时日志与超时，返回 bool"""