From 05062562f08194ac42bf1b8b10063a0e93c38f09 Mon Sep 17 00:00:00 2001 From: AndyMik90 Date: Sat, 20 Dec 2025 13:25:53 +0100 Subject: [PATCH] fix: resolve Python lint errors in workspace.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Consolidate split import blocks for core.workspace.display and core.workspace.git_utils - Remove duplicate module-level `import re` (already imported in function scope) - Sort import block alphabetically (asyncio, logging, os) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- auto-claude/core/workspace.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/auto-claude/core/workspace.py b/auto-claude/core/workspace.py index 51403384..42aac44f 100644 --- a/auto-claude/core/workspace.py +++ b/auto-claude/core/workspace.py @@ -72,24 +72,14 @@ except ImportError: # Import merge system from core.workspace.display import ( print_conflict_info as _print_conflict_info, -) -from core.workspace.display import ( print_merge_success as _print_merge_success, -) -from core.workspace.display import ( show_build_summary, ) from core.workspace.git_utils import ( _is_auto_claude_file, - get_existing_build_worktree, -) -from core.workspace.git_utils import ( get_changed_files_from_branch as _get_changed_files_from_branch, -) -from core.workspace.git_utils import ( + get_existing_build_worktree, get_file_content_from_ref as _get_file_content_from_ref, -) -from core.workspace.git_utils import ( is_lock_file as _is_lock_file, ) @@ -1003,9 +993,8 @@ def _resolve_git_conflicts_with_ai( # ============================================================================= import asyncio -import os -import re import logging +import os _merge_logger = logging.getLogger(__name__)