crackerjack 0.21.7__tar.gz → 0.21.8__tar.gz

{crackerjack-0.21.7 → crackerjack-0.21.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.21.7
+Version: 0.21.8
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/__init__.py

@@ -1,4 +1,5 @@
 import typing as t
+
 from .crackerjack import Crackerjack, create_crackerjack_runner
 from .errors import (
     CleaningError,

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/__main__.py

@@ -1,4 +1,5 @@
 from enum import Enum
+
 import typer
 from pydantic import BaseModel, field_validator
 from rich.console import Console

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/crackerjack.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from subprocess import CompletedProcess
 from subprocess import run as execute
 from tomllib import loads
+
 from pydantic import BaseModel
 from rich.console import Console
 from tomli_w import dumps
@@ -169,9 +170,12 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         cleaned_lines = []
         docstring_state = self._initialize_docstring_state()
         for i, line in enumerate(lines):
-            _, result_line = self._process_line(lines, i, line, docstring_state)
-            if result_line:
-                cleaned_lines.append(result_line)
+            handled, result_line = self._process_line(lines, i, line, docstring_state)
+            if handled:
+                if result_line is not None:
+                    cleaned_lines.append(result_line)
+            else:
+                cleaned_lines.append(line)
         return "\n".join(cleaned_lines)
 
     def _is_function_or_class_definition(self, stripped_line: str) -> bool:
@@ -287,13 +291,15 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         lines = code.split("\n")
         cleaned_lines = []
         function_tracker = {"in_function": False, "function_indent": 0}
+        import_tracker = {"in_imports": False, "last_import_type": None}
         for i, line in enumerate(lines):
             line = line.rstrip()
             stripped_line = line.lstrip()
             self._update_function_state(line, stripped_line, function_tracker)
+            self._update_import_state(line, stripped_line, import_tracker)
             if not line:
                 if self._should_skip_empty_line(
-                    i, lines, cleaned_lines, function_tracker
+                    i, lines, cleaned_lines, function_tracker, import_tracker
                 ):
                     continue
             cleaned_lines.append(line)
@@ -309,6 +315,113 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             function_tracker["in_function"] = False
             function_tracker["function_indent"] = 0
 
+    def _update_import_state(
+        self, line: str, stripped_line: str, import_tracker: dict[str, t.Any]
+    ) -> None:
+        if stripped_line.startswith(("import ", "from ")):
+            import_tracker["in_imports"] = True
+            if self._is_stdlib_import(stripped_line):
+                current_type = "stdlib"
+            elif self._is_local_import(stripped_line):
+                current_type = "local"
+            else:
+                current_type = "third_party"
+            import_tracker["last_import_type"] = current_type
+        elif stripped_line and not stripped_line.startswith("#"):
+            import_tracker["in_imports"] = False
+            import_tracker["last_import_type"] = None
+
+    def _is_stdlib_import(self, stripped_line: str) -> bool:
+        try:
+            if stripped_line.startswith("from "):
+                module = stripped_line.split()[1].split(".")[0]
+            else:
+                module = stripped_line.split()[1].split(".")[0]
+        except IndexError:
+            return False
+        stdlib_modules = {
+            "os",
+            "sys",
+            "re",
+            "json",
+            "datetime",
+            "time",
+            "pathlib",
+            "typing",
+            "collections",
+            "itertools",
+            "functools",
+            "operator",
+            "math",
+            "random",
+            "uuid",
+            "urllib",
+            "http",
+            "html",
+            "xml",
+            "email",
+            "csv",
+            "sqlite3",
+            "subprocess",
+            "threading",
+            "multiprocessing",
+            "asyncio",
+            "contextlib",
+            "dataclasses",
+            "enum",
+            "abc",
+            "io",
+            "tempfile",
+            "shutil",
+            "glob",
+            "pickle",
+            "copy",
+            "heapq",
+            "bisect",
+            "array",
+            "struct",
+            "zlib",
+            "hashlib",
+            "hmac",
+            "secrets",
+            "base64",
+            "binascii",
+            "codecs",
+            "locale",
+            "platform",
+            "socket",
+            "ssl",
+            "ipaddress",
+            "logging",
+            "warnings",
+            "inspect",
+            "ast",
+            "dis",
+            "tokenize",
+            "keyword",
+            "linecache",
+            "traceback",
+            "weakref",
+            "gc",
+            "ctypes",
+            "unittest",
+            "doctest",
+            "pdb",
+            "profile",
+            "cProfile",
+            "timeit",
+            "trace",
+            "calendar",
+            "decimal",
+            "fractions",
+            "statistics",
+            "tomllib",
+        }
+        return module in stdlib_modules
+
+    def _is_local_import(self, stripped_line: str) -> bool:
+        return stripped_line.startswith("from .") or " . " in stripped_line
+
     def _is_function_end(
         self, line: str, stripped_line: str, function_tracker: dict[str, t.Any]
     ) -> bool:
@@ -325,13 +438,44 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         lines: list[str],
         cleaned_lines: list[str],
         function_tracker: dict[str, t.Any],
+        import_tracker: dict[str, t.Any],
     ) -> bool:
         if line_idx > 0 and cleaned_lines and (not cleaned_lines[-1]):
             return True
+
+        if self._is_import_section_separator(line_idx, lines, import_tracker):
+            return False
+
         if function_tracker["in_function"]:
             return self._should_skip_function_empty_line(line_idx, lines)
         return False
 
+    def _is_import_section_separator(
+        self, line_idx: int, lines: list[str], import_tracker: dict[str, t.Any]
+    ) -> bool:
+        if not import_tracker["in_imports"]:
+            return False
+
+        next_line_idx = line_idx + 1
+        while next_line_idx < len(lines) and not lines[next_line_idx].strip():
+            next_line_idx += 1
+
+        if next_line_idx >= len(lines):
+            return False
+
+        next_line = lines[next_line_idx].strip()
+        if not next_line.startswith(("import ", "from ")):
+            return False
+
+        if self._is_stdlib_import(next_line):
+            next_type = "stdlib"
+        elif self._is_local_import(next_line):
+            next_type = "local"
+        else:
+            next_type = "third_party"
+
+        return import_tracker["last_import_type"] != next_type
+
     def _should_skip_function_empty_line(self, line_idx: int, lines: list[str]) -> bool:
         next_line_idx = line_idx + 1
         if next_line_idx >= len(lines):

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/errors.py

@@ -2,6 +2,7 @@ import sys
 import typing as t
 from enum import Enum
 from pathlib import Path
+
 from rich.console import Console
 from rich.panel import Panel
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/interactive.py

@@ -2,6 +2,7 @@ import time
 import typing as t
 from enum import Enum, auto
 from pathlib import Path
+
 from rich.box import ROUNDED
 from rich.console import Console
 from rich.layout import Layout
@@ -18,6 +19,7 @@ from rich.prompt import Confirm, Prompt
 from rich.table import Table
 from rich.text import Text
 from rich.tree import Tree
+
 from .errors import CrackerjackError, ErrorCode, handle_error
 
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.21.6"
+version = "0.21.7"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [

{crackerjack-0.21.7 → crackerjack-0.21.8}/pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "crackerjack"
-version = "0.21.7"
+version = "0.21.8"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/conftest.py

@@ -2,6 +2,7 @@ import os
 import time
 import typing as t
 from pathlib import Path
+
 import pytest
 from pytest import Config, Item, Parser
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_crackerjack.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console
 from crackerjack.crackerjack import (
@@ -1067,6 +1068,7 @@ class TestCrackerjackProcess:
 
     def test_code_cleaner_remove_docstrings(self) -> None:
         import ast
+
         from rich.console import Console
         from crackerjack.crackerjack import CodeCleaner
 
@@ -1093,6 +1095,7 @@ class TestCrackerjackProcess:
 
     def test_code_cleaner_remove_docstrings_empty_functions(self) -> None:
         import ast
+
         from rich.console import Console
         from crackerjack.crackerjack import CodeCleaner
 
@@ -1124,6 +1127,7 @@ class TestClass:
 
     def test_code_cleaner_remove_line_comments(self) -> None:
         from pathlib import Path
+
         from rich.console import Console
         from crackerjack.crackerjack import CodeCleaner
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_crackerjack_runner.py

@@ -2,6 +2,7 @@ import tempfile
 import typing as t
 from pathlib import Path
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console
 from crackerjack import create_crackerjack_runner

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_errors.py

@@ -1,5 +1,6 @@
 import typing as t
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console
 from crackerjack.errors import (

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_interactive.py

@@ -2,6 +2,7 @@ import io
 import time
 from pathlib import Path
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console
 from rich.panel import Panel

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_interactive_run.py

@@ -1,4 +1,5 @@
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console
 from crackerjack.errors import ErrorCode, ExecutionError

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_main.py

@@ -1,5 +1,6 @@
 import typing as t
 from unittest.mock import MagicMock, patch
+
 import pytest
 from typer.testing import CliRunner
 from crackerjack.__main__ import BumpOption, Options, app

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_multiline_functions.py

@@ -1,6 +1,7 @@
 """Test cases for multiline function definitions in docstring removal."""
 
 import ast
+
 from rich.console import Console
 from crackerjack.crackerjack import CodeCleaner
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_py313_advanced.py

@@ -2,6 +2,7 @@ import subprocess
 from pathlib import Path
 from typing import Any
 from unittest import mock
+
 from crackerjack.py313 import (
     CommandResult,
     CommandRunner,

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_py313_features.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from crackerjack.py313 import (
     CommandResult,
     HookResult,

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_pytest_features.py

@@ -1,4 +1,5 @@
 import time
+
 import pytest
 
 

{crackerjack-0.21.7 → crackerjack-0.21.8}/tests/test_structured_errors.py

@@ -2,6 +2,7 @@ import io
 import typing as t
 from pathlib import Path
 from unittest.mock import MagicMock, patch
+
 import pytest
 from rich.console import Console