From 509adb7cbcf79c24a68dbaaaeae3e3b67d3d0d91 Mon Sep 17 00:00:00 2001 From: claude Date: Sat, 20 Jun 2026 02:24:49 +0000 Subject: [PATCH] fix: resolve pyright reportUnusedImport in manifest_extends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Import ManifestError at module level from manifest_util (no circular dep) and remove the redundant local imports from function bodies that were shadowing it. ManifestBottle retains its local import pattern to avoid the circular manifest ↔ manifest_extends dependency. --- bot_bottle/manifest_extends.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bot_bottle/manifest_extends.py b/bot_bottle/manifest_extends.py index b58e4d5..b4a0ab9 100644 --- a/bot_bottle/manifest_extends.py +++ b/bot_bottle/manifest_extends.py @@ -4,6 +4,8 @@ from __future__ import annotations from typing import TYPE_CHECKING +from .manifest_util import ManifestError + if TYPE_CHECKING: from .manifest import ManifestBottle from .manifest_egress import ManifestEgressConfig @@ -31,8 +33,6 @@ def resolve_bottles_partial( collected in `broken` rather than raising, so unrelated bottles remain usable. Errors for parent bottles propagate to all children that extend them.""" - from .manifest import ManifestError - cache: dict[str, ManifestBottle] = {} broken: dict[str, ManifestError] = {} for name in raws: @@ -48,7 +48,7 @@ def _resolve_one_bottle( repos_cache: dict[str, dict[str, object]], seen: tuple[str, ...], ) -> ManifestBottle: - from .manifest import ManifestBottle, ManifestError + from .manifest import ManifestBottle if name in cache: return cache[name] @@ -239,7 +239,7 @@ def _resolve_one_bottle_partial( seen: tuple[str, ...], ) -> None: """Error-tolerant variant: on failure, adds to `broken` instead of raising.""" - from .manifest import ManifestBottle, ManifestError + from .manifest import ManifestBottle if name in cache or name in broken: return