ballpython 2.1.1__tar.gz → 2.1.2__tar.gz

{ballpython-2.1.1 → ballpython-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ballpython
-Version: 2.1.1
+Version: 2.1.2
 Summary: The Ultimate Static Python Intelligence, Healing, Type Verification, and Security Suite
 Author: Developer
 License-Expression: MIT

{ballpython-2.1.1 → ballpython-2.1.2}/ballpython.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ballpython
-Version: 2.1.1
+Version: 2.1.2
 Summary: The Ultimate Static Python Intelligence, Healing, Type Verification, and Security Suite
 Author: Developer
 License-Expression: MIT

{ballpython-2.1.1 → ballpython-2.1.2}/pycleaner/cli.py

@@ -901,7 +901,9 @@ def _run_progress_fix(
         backup=opts.backup,
         in_progress=True,
     )
-    _print_msg, console, _is_json = io_ctx
+    print_msg, console, is_json = io_ctx
+    modified_items: list[tuple[CleanResult, Path]] = []
+
     with Progress(
         SpinnerColumn(),
         TextColumn("[progress.description]{task.description}"),
@@ -916,8 +918,18 @@ def _run_progress_fix(
                 py_file, apply_changes=opts.apply_changes, backup=opts.backup
             )
             _accumulate_result(result, py_file, state, prog_opts, io_ctx)
+            if result.changed or result.error or result.syntax_repairs:
+                modified_items.append((result, py_file))
             progress.advance(task)
 
+    if not is_json and modified_items:
+        print_msg("")
+        for res, py_file in modified_items:
+            if not res.error and res.changed:
+                _report_file_modifications(res, py_file, opts.apply_changes, print_msg)
+                if opts.show_diff and res.diff:
+                    _render_fix_diff(res.diff, console)
+
 
 def _execute_fix_batch(
     pipeline: CleanPipeline,
@@ -2271,6 +2283,7 @@ def _cmd_watch(
     except KeyboardInterrupt:
         print_msg("\n[bold]Watch mode stopped.[/bold]")
         return 0
+    return 0
 
 
 def _cmd_hook(args: argparse.Namespace, print_msg) -> int:

{ballpython-2.1.1 → ballpython-2.1.2}/pycleaner/dead_code_detector.py

@@ -155,7 +155,9 @@ class _DefinitionCollector(ast.NodeVisitor):
                 return
 
         # Module-level constants or class attributes (not local function variables)
-        if not self._scope_stack or len(self._scope_stack) == 1:
+        if not self._scope_stack or (
+            self._class_stack and len(self._scope_stack) == len(self._class_stack)
+        ):
             for target in node.targets:
                 if isinstance(target, ast.Name):
                     name = target.id
@@ -184,9 +186,12 @@ class _DefinitionCollector(ast.NodeVisitor):
                 self.generic_visit(node)
                 return
 
-        if (not self._scope_stack or len(self._scope_stack) == 1) and isinstance(
-            node.target, ast.Name
-        ):
+        if (
+            not self._scope_stack
+            or (
+                self._class_stack and len(self._scope_stack) == len(self._class_stack)
+            )
+        ) and isinstance(node.target, ast.Name):
             name = node.target.id
             if not name.startswith("__"):
                 context = (
@@ -573,9 +578,23 @@ class _ProjectScanState:
     def process_file(self, py_file: Path) -> None:
         try:
             content = py_file.read_text(encoding="utf-8", errors="replace")
+        except OSError:
+            return
+
+        try:
             tree = ast.parse(content, filename=str(py_file))
         except SyntaxError:
-            return
+            from pycleaner.syntax_healer import SyntaxHealer
+
+            heal_res = SyntaxHealer().heal(content, filename=str(py_file))
+            if heal_res.is_valid:
+                try:
+                    tree = ast.parse(heal_res.code, filename=str(py_file))
+                    content = heal_res.code
+                except SyntaxError:
+                    return
+            else:
+                return
 
         filepath_str = str(py_file)
         def_collector = _DefinitionCollector(
@@ -762,17 +781,28 @@ class DeadCodeDetector:
         return self.scan_files(py_files)
 
     def scan_source(self, source: str, filename: str = "<unknown>") -> DeadCodeReport:
-        """Scan a single source string for dead code patterns (unreachable/empty only)."""
+        """Scan a single source string for dead code patterns (unreachable, empty branches, and local dead variables)."""
         try:
             tree = ast.parse(source, filename=filename)
         except SyntaxError:
-            return DeadCodeReport()
+            from pycleaner.syntax_healer import SyntaxHealer
+
+            heal_res = SyntaxHealer().heal(source, filename=filename)
+            if heal_res.is_valid:
+                try:
+                    tree = ast.parse(heal_res.code, filename=filename)
+                except SyntaxError:
+                    return DeadCodeReport()
+            else:
+                return DeadCodeReport()
 
         unreachable = _UnreachableCodeDetector(filename, source.splitlines())
         unreachable.visit(tree)
 
+        items = list(unreachable.items)
+        items.sort(key=lambda x: (x.filepath, x.lineno))
         return DeadCodeReport(
-            items=unreachable.items,
+            items=items,
             files_scanned=1,
             total_definitions=0,
         )

{ballpython-2.1.1 → ballpython-2.1.2}/pycleaner/frameworks/__init__.py

@@ -55,9 +55,11 @@ class FrameworkRegistry:
 
     def __init__(self) -> None:
         self._plugins: list[FrameworkPlugin] = []
+        self._applicable_cache: dict[tuple[int, str], list[FrameworkPlugin]] = {}
 
     def register(self, plugin: FrameworkPlugin) -> None:
         self._plugins.append(plugin)
+        self._applicable_cache.clear()
 
     @property
     def plugins(self) -> list[FrameworkPlugin]:
@@ -66,7 +68,12 @@ class FrameworkRegistry:
     def get_applicable_plugins(
         self, tree: ast.AST, filepath: Path | str
     ) -> list[FrameworkPlugin]:
-        return [p for p in self._plugins if p.is_applicable(tree, filepath)]
+        cache_key = (id(tree), str(filepath))
+        if cache_key in self._applicable_cache:
+            return self._applicable_cache[cache_key]
+        applicable = [p for p in self._plugins if p.is_applicable(tree, filepath)]
+        self._applicable_cache[cache_key] = applicable
+        return applicable
 
     def is_protected(
         self,

{ballpython-2.1.1 → ballpython-2.1.2}/pycleaner/linter_formatter.py

@@ -57,6 +57,25 @@ class _UsageCollector(ast.NodeVisitor):
         self.generic_visit(node)
 
 
+def _find_executable(name: str) -> str | None:
+    """Find CLI tool executable in PATH, virtual environment Scripts/bin, or python directory."""
+    found = shutil.which(name)
+    if found:
+        return found
+    from pathlib import Path
+    scripts_dir = Path(sys.prefix) / ("Scripts" if sys.platform == "win32" else "bin")
+    for ext in (".exe", ""):
+        candidate = scripts_dir / f"{name}{ext}"
+        if candidate.is_file():
+            return str(candidate)
+    parent_dir = Path(sys.executable).parent
+    for ext in (".exe", ""):
+        candidate = parent_dir / f"{name}{ext}"
+        if candidate.is_file():
+            return str(candidate)
+    return None
+
+
 class LinterFormatter:
     """Orchestrates static lint autofixes and canonical formatting."""
 
@@ -72,10 +91,10 @@ class LinterFormatter:
     DEFAULT_SELECT_RULES = "F401,F841,I,UP,E,W,B,SIM,RUF"
 
     def __init__(self, ruff_path: str | None = None) -> None:
-        self.ruff_cmd: str | None = ruff_path or shutil.which("ruff")
-        self.autoflake_cmd: str | None = shutil.which("autoflake")
-        self.black_cmd: str | None = shutil.which("black")
-        self.isort_cmd: str | None = shutil.which("isort")
+        self.ruff_cmd: str | None = ruff_path or _find_executable("ruff")
+        self.autoflake_cmd: str | None = _find_executable("autoflake")
+        self.black_cmd: str | None = _find_executable("black")
+        self.isort_cmd: str | None = _find_executable("isort")
 
     def fix_and_format(
         self,

{ballpython-2.1.1 → ballpython-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ballpython"
-version = "2.1.1"
+version = "2.1.2"
 description = "The Ultimate Static Python Intelligence, Healing, Type Verification, and Security Suite"
 readme = "README.md"
 requires-python = ">=3.10"

{ballpython-2.1.1 → ballpython-2.1.2}/tests/test_dead_code_detector.py

@@ -135,6 +135,28 @@ class TestDeadCodeDetector(unittest.TestCase):
             dead_names = [item.name for item in report.items if item.kind == "function"]
             self.assertNotIn("shared_tool", dead_names)
 
+    def test_unused_local_variable_detection(self) -> None:
+        code = (
+            "def compute(a, b):\n"
+            "    unused_res = a * b\n"
+            "    return a + b\n"
+        )
+        report = self.detector.scan_source(code, filename="compute.py")
+        vars_found = [item.name for item in report.items if item.kind == "variable"]
+        self.assertIn("unused_res", vars_found)
+
+    def test_scan_source_with_syntax_healing(self) -> None:
+        # Code with missing colon that is healable
+        code = (
+            "def broken(x)\n"
+            "    dead_val = 123\n"
+            "    return x\n"
+        )
+        report = self.detector.scan_source(code, filename="broken.py")
+        vars_found = [item.name for item in report.items if item.kind == "variable"]
+        self.assertIn("dead_val", vars_found)
+
 
 if __name__ == "__main__":
     unittest.main()
+