From 7c8379f398ba2920faf6c071aa1b13f4ee3abb54 Mon Sep 17 00:00:00 2001 From: im47cn-bot Date: Sun, 18 Oct 2026 09:57:10 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B8=85=E9=9B=B6=20sourcery=20gate?= =?UTF-8?q?=2016=20=E9=A1=B9=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/wop_sdk/config/_loader.py | 9 ++++---- src/wop_sdk/config/_models.py | 2 +- src/wop_sdk/config/_parser.py | 6 +---- src/wop_sdk/config/_validator.py | 2 +- src/wop_sdk/transport_discovery.py | 7 ++---- src/wop_sdk/transports/urllib_transport.py | 6 ++--- tests/helpers.py | 27 ++++++++++++++++++++++ tests/test_config.py | 24 ++----------------- tests/test_config_loading.py | 2 +- 9 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 tests/helpers.py diff --git a/src/wop_sdk/config/_loader.py b/src/wop_sdk/config/_loader.py index 22466ce..0ff9a7d 100644 --- a/src/wop_sdk/config/_loader.py +++ b/src/wop_sdk/config/_loader.py @@ -78,7 +78,7 @@ def _read_packaged(resource: str) -> str: resource_name = resource.split("/", 1)[-1] if "/" in resource else resource try: data = resources.files(package).joinpath(resource_name).read_text(encoding="utf-8") - except (FileNotFoundError, OSError, TypeError) as exc: + except (OSError, TypeError) as exc: raise ConfigurationError(f"打包资源不存在: {resource}") from exc return data @@ -87,8 +87,7 @@ def _discover() -> tuple[str, Callable[[], str]]: """§4.2 六来源发现顺序。""" explicit = os.environ.get(CONFIG_FILE_OVERRIDE_ENV, "").strip() if explicit: - path = Path(explicit) - return _file_discovery(path, explicit=True) + return _file_discovery(Path(explicit), explicit=True) env = os.environ.get(CONFIG_FILE_ENV, "").strip() if env: @@ -108,12 +107,12 @@ def _discover() -> tuple[str, Callable[[], str]]: packaged = PACKAGED_CONFIG.rsplit("/", 1)[-1] try: resources.files("wop_sdk.config").joinpath(packaged).read_bytes() - except (FileNotFoundError, OSError, TypeError): + except (OSError, TypeError) as exc: expanded = ", ".join(str(item) for item in candidates) raise ConfigurationError( "未找到可读配置文件,已尝试: " f"WOP_SDK_CONFIG_FILE, {CONFIG_FILE_ENV}, {expanded}, 打包资源 {PACKAGED_CONFIG}" - ) + ) from exc cache_key = f"pkg:{PACKAGED_CONFIG}" return cache_key, lambda: _read_packaged(PACKAGED_CONFIG) diff --git a/src/wop_sdk/config/_models.py b/src/wop_sdk/config/_models.py index bfff737..5b331ab 100644 --- a/src/wop_sdk/config/_models.py +++ b/src/wop_sdk/config/_models.py @@ -64,7 +64,7 @@ def __init__(self) -> None: self._merchant_private_key: Optional[str] = None self._platform_public_key: Optional[str] = None self._server_root: Optional[str] = None - self._backup_server_roots: Tuple[str, ...] = tuple() + self._backup_server_roots: Tuple[str, ...] = () self._expired_seconds: int = DEFAULT_EXPIRED_SECONDS self._http_client: HttpClientSettings = HttpClientSettings() self._transport: Optional["Transport"] = None diff --git a/src/wop_sdk/config/_parser.py b/src/wop_sdk/config/_parser.py index 13a84e6..6c05aa3 100644 --- a/src/wop_sdk/config/_parser.py +++ b/src/wop_sdk/config/_parser.py @@ -73,11 +73,7 @@ def parse_config_json(text: str) -> WopSdkConfig: def _bind_root(root: Mapping[str, Any]) -> WopSdkConfig: - unknown = set(root.keys()) - _ALLOWED_TOP_LEVEL - if unknown: - # 未知字段忽略:仅处理已知键 - pass - + # 未知字段忽略:仅处理已知键 app_key = _require_string(root.get("appKey"), "appKey", required=False) suite = _require_string(root.get("suite"), "suite", required=False) merchant_private_key = _require_string( diff --git a/src/wop_sdk/config/_validator.py b/src/wop_sdk/config/_validator.py index ef17f32..347b31e 100644 --- a/src/wop_sdk/config/_validator.py +++ b/src/wop_sdk/config/_validator.py @@ -93,7 +93,7 @@ def validate_gateway_url(value: str, field_name: str) -> str: def validate_api_path(path: str) -> None: """§7.7 API path 语法校验。""" - if path is None or path == "": + if path is None or not path: raise ConfigurationError("请求路径为空") if not path.startswith("/"): raise ConfigurationError(f"path 须以 / 开头: {path}") diff --git a/src/wop_sdk/transport_discovery.py b/src/wop_sdk/transport_discovery.py index 422ed67..bf0c04c 100644 --- a/src/wop_sdk/transport_discovery.py +++ b/src/wop_sdk/transport_discovery.py @@ -17,8 +17,7 @@ def discover_transport() -> Transport: available = _available_transports() if not available: raise ConfigurationError("未找到可用 HTTP 传输,请确认 wop-python-sdk 安装完整") - explicit = os.environ.get(_TRANSPORT_ENV, "").strip().lower() - if explicit: + if explicit := os.environ.get(_TRANSPORT_ENV, "").strip().lower(): transport = available.get(explicit) if transport is None: names = ", ".join(sorted(available)) @@ -47,7 +46,5 @@ def _available_transports() -> Dict[str, type]: from .transports.requests_transport import RequestsTransport found["requests"] = RequestsTransport - # P0:仅 urllib 时不视为「多个」——过滤后若显式 env 未设且仅 urllib,直接返回 - if set(found.keys()) == {"urllib"}: - return found + # P0:仅 urllib 时不视为「多个」——显式 env 未设且仅 urllib 时直接返回 return found diff --git a/src/wop_sdk/transports/urllib_transport.py b/src/wop_sdk/transports/urllib_transport.py index 18f2618..0c088ba 100644 --- a/src/wop_sdk/transports/urllib_transport.py +++ b/src/wop_sdk/transports/urllib_transport.py @@ -11,10 +11,10 @@ def _urllib_chunks(resp) -> Iterator[bytes]: """resp.read(n) 循环取块,直至 EOF;配合 read_capped 流式限量。""" while True: - chunk = resp.read(_READ_CHUNK) - if not chunk: + if chunk := resp.read(_READ_CHUNK): + yield chunk + else: break - yield chunk class UrllibTransport: diff --git a/tests/helpers.py b/tests/helpers.py new file mode 100644 index 0000000..3974a1c --- /dev/null +++ b/tests/helpers.py @@ -0,0 +1,27 @@ +"""测试共享 helper(独立模块:test 模块间禁止互相 import,Sourcery dont-import-test-modules)。""" +import json +from pathlib import Path + +RSA_REQ = "WOP-RSA3072-SHA256" + + +def _valid_config_dict(vec_keys) -> dict: + return { + "appKey": "app_10012481831", + "suite": RSA_REQ, + "merchantPrivateKey": vec_keys["rsa3072"]["privatePkcs8B64"], + "platformPublicKey": vec_keys["rsa3072"]["publicSpkiB64"], + "serverRoot": "https://gw.example.com/gateway", + "backupServerRoots": ["https://gw-backup.example.com/gateway"], + "expiredSeconds": 1800, + "httpClient": { + "connectTimeout": 10000, + "readTimeout": 30000, + "maxRetryCount": 3, + }, + } + + +def _write_config(path: Path, payload: dict) -> None: + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(json.dumps(payload, ensure_ascii=False), encoding="utf-8") diff --git a/tests/test_config.py b/tests/test_config.py index 058bd30..dbd3bf0 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -16,31 +16,11 @@ from wop_sdk.config._validator import join_url, validate_api_path, validate_gateway_url from wop_sdk.errors import ConfigurationError, WopGatewayResponseError from wop_sdk.transports import HttpResponse +from helpers import RSA_REQ, _valid_config_dict, _write_config -RSA_REQ = "WOP-RSA3072-SHA256" -PATH = "/gateway/order/create" +PATH = "/gateway/order/create" -def _valid_config_dict(vec_keys) -> dict: - return { - "appKey": "app_10012481831", - "suite": RSA_REQ, - "merchantPrivateKey": vec_keys["rsa3072"]["privatePkcs8B64"], - "platformPublicKey": vec_keys["rsa3072"]["publicSpkiB64"], - "serverRoot": "https://gw.example.com/gateway", - "backupServerRoots": ["https://gw-backup.example.com/gateway"], - "expiredSeconds": 1800, - "httpClient": { - "connectTimeout": 10000, - "readTimeout": 30000, - "maxRetryCount": 3, - }, - } - - -def _write_config(path: Path, payload: dict) -> None: - path.parent.mkdir(parents=True, exist_ok=True) - path.write_text(json.dumps(payload, ensure_ascii=False), encoding="utf-8") @pytest.fixture diff --git a/tests/test_config_loading.py b/tests/test_config_loading.py index 503866e..7a3a008 100644 --- a/tests/test_config_loading.py +++ b/tests/test_config_loading.py @@ -17,7 +17,7 @@ from wop_sdk.config._parser import parse_config_json from wop_sdk.config._validator import validate_api_path, validate_gateway_url from wop_sdk.errors import ConfigurationError -from test_config import _valid_config_dict, _write_config +from helpers import _valid_config_dict, _write_config def _raw(vec_keys, **overrides): From 5df1cf7a5b2e0d90f222baaf7713d2575eecffee Mon Sep 17 00:00:00 2001 From: im47cn-bot Date: Sun, 18 Oct 2026 10:00:55 +0000 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20sourcery=20=E5=89=A9=E4=BD=99=203=20?= =?UTF-8?q?=E9=A1=B9=EF=BC=88env=20=E6=B5=B7=E8=B1=A1+=E4=B8=89=E5=85=83?= =?UTF-8?q?=E8=BD=AC=E4=B9=89=E6=9C=AA=E7=94=9F=E6=95=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/wop_sdk/config/_loader.py | 3 +-- src/wop_sdk/config/_parser.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wop_sdk/config/_loader.py b/src/wop_sdk/config/_loader.py index 0ff9a7d..2669240 100644 --- a/src/wop_sdk/config/_loader.py +++ b/src/wop_sdk/config/_loader.py @@ -89,8 +89,7 @@ def _discover() -> tuple[str, Callable[[], str]]: if explicit: return _file_discovery(Path(explicit), explicit=True) - env = os.environ.get(CONFIG_FILE_ENV, "").strip() - if env: + if env := os.environ.get(CONFIG_FILE_ENV, "").strip(): path = Path(env) return _file_discovery(path, explicit=True) diff --git a/src/wop_sdk/config/_parser.py b/src/wop_sdk/config/_parser.py index 6c05aa3..88c25b6 100644 --- a/src/wop_sdk/config/_parser.py +++ b/src/wop_sdk/config/_parser.py @@ -45,9 +45,7 @@ def _duplicate_key_hook(pairs: List[Tuple[str, Any]]) -> Dict[str, Any]: def _strip_bom(text: str) -> str: - if text.startswith("\ufeff"): - return text[1:] - return text + return text[1:] if text.startswith("\ufeff") else text def parse_config_json(text: str) -> WopSdkConfig: