From d819502b00ac48f5dcb7c58184244632d9c26f5f Mon Sep 17 00:00:00 2001 From: xiaoli-cli Date: Sat, 25 Apr 2026 22:45:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Windows=20=E4=B8=8A?= =?UTF-8?q?=20resource=20=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=85=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xcli_core/cli_code_exec.py | 7 +------ xcli_core/sandbox.py | 8 ++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xcli_core/cli_code_exec.py b/xcli_core/cli_code_exec.py index e916a16..b418186 100644 --- a/xcli_core/cli_code_exec.py +++ b/xcli_core/cli_code_exec.py @@ -10,14 +10,9 @@ from colorama import Fore, Style from .config import logger from .sandbox import ( _sandbox_checker, _make_sandbox_worker, _sandbox_work_dir, - _HAS_RESOURCE, _SAFE_WHITELIST, + _HAS_RESOURCE, _SAFE_WHITELIST, _resource_mod, ) -try: - import resource as _resource_mod -except ImportError: - _resource_mod = None - class CodeExecMixin: """代码沙箱执行相关方法""" diff --git a/xcli_core/sandbox.py b/xcli_core/sandbox.py index 043e751..0669d44 100644 --- a/xcli_core/sandbox.py +++ b/xcli_core/sandbox.py @@ -4,9 +4,13 @@ import ast as _ast import re import textwrap as _textwrap import tempfile as _tempfile -import resource as _resource_mod -_HAS_RESOURCE = hasattr(_resource_mod, 'setrlimit') +try: + import resource as _resource_mod + _HAS_RESOURCE = hasattr(_resource_mod, 'setrlimit') +except ImportError: + _resource_mod = None + _HAS_RESOURCE = False _BLOCKED_MODULES = frozenset({ 'os', 'sys', 'subprocess', 'shutil', 'socket', 'pickle',