crackerjack 0.21.7__py3-none-any.whl → 0.21.8__py3-none-any.whl

crackerjack/__init__.py

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

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/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/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/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/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.dist-info → crackerjack-0.21.8.dist-info}/METADATA

@@ -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.dist-info → crackerjack-0.21.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-crackerjack-0.21.7.dist-info/METADATA,sha256=suf-qK6MQQTYL6v8ZXcTUT70x6ADX6u1Dd8YvhQSV60,26442
-crackerjack-0.21.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.21.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.21.7.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.21.8.dist-info/METADATA,sha256=IPe32XzA-hFDy247TIpvfAOWuWZwr64gbhZCUbsP4jQ,26442
+crackerjack-0.21.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.21.8.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.21.8.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=n8cD6U16L3XZn__PvhYm_F7-YeFHFucHCyxWj2NZCGs,259
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pdm.toml,sha256=dZe44HRcuxxCFESGG8SZIjmc-cGzSoyK3Hs6t4NYA8w,23
@@ -34,7 +34,7 @@ crackerjack/.ruff_cache/0.11.7/10386934055395314831,sha256=lBNwN5zAgM4OzbkXIOzCc
 crackerjack/.ruff_cache/0.11.7/3557596832929915217,sha256=fKlwUbsvT3YIKV6UR-aA_i64lLignWeVfVu-MMmVbU0,207
 crackerjack/.ruff_cache/0.11.8/530407680854991027,sha256=xAMAL3Vu_HR6M-h5ojCTaak0By5ii8u-14pXULLgLqw,224
 crackerjack/.ruff_cache/0.12.0/5056746222905752453,sha256=MqrIT5qymJcgAOBZyn-TvYoGCFfDFCgN9IwSULq8n14,256
-crackerjack/.ruff_cache/0.12.1/5056746222905752453,sha256=CHy2IV23GK0EauutmCmddO7Ck-fHMzbvpvZ1ZO9Cp8Y,256
+crackerjack/.ruff_cache/0.12.1/5056746222905752453,sha256=g9fAkLYZwfeJKgDNXhdsOwHnHBgTG5KKHfMoy5Lut1s,256
 crackerjack/.ruff_cache/0.2.0/10047773857155985907,sha256=j9LNa_RQ4Plor7go1uTYgz17cEENKvZQ-dP6b9MX0ik,248
 crackerjack/.ruff_cache/0.2.1/8522267973936635051,sha256=u_aPBMibtAp_iYvLwR88GMAECMcIgHezxMyuapmU2P4,248
 crackerjack/.ruff_cache/0.2.2/18053836298936336950,sha256=Xb_ebP0pVuUfSqPEZKlhQ70so_vqkEfMYpuHQ06iR5U,248
@@ -62,11 +62,11 @@ crackerjack/.ruff_cache/0.9.3/13948373885254993391,sha256=kGhtIkzPUtKAgvlKs3D8j4
 crackerjack/.ruff_cache/0.9.9/12813592349865671909,sha256=tmr8_vhRD2OxsVuMfbJPdT9fDFX-d5tfC5U9jgziyho,224
 crackerjack/.ruff_cache/0.9.9/8843823720003377982,sha256=e4ymkXfQsUg5e_mtO34xTsaTvs1uA3_fI216Qq9qCAM,136
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
-crackerjack/__init__.py,sha256=LyIPEfjBcqWp7UVuJ-b7cc8oiFxrQqyL8RJ7g6c17Qs,838
-crackerjack/__main__.py,sha256=GP5GBbWK5lDTQanCHKVEyS3hDWvshwlrhWagzQlRuD4,6560
-crackerjack/crackerjack.py,sha256=jlepiHgMkvTyl83O8HUqC4mCsQbZIejerOHNQD15JcU,35854
-crackerjack/errors.py,sha256=xvXO3bk0VrxQz0lysIuVOju6SxxDgf04Wne1BedLFB8,4061
-crackerjack/interactive.py,sha256=ierA2jeUsigTJhKOcJJsjhBZm2WwsQpvow3Y5ppF7IE,16151
+crackerjack/__init__.py,sha256=8tBSPAru_YDuPpjz05cL7pNbZjYFoRT_agGd_FWa3gY,839
+crackerjack/__main__.py,sha256=AknITUlFjq3YUK9s2xeL62dM0GN82JBQyDkPzQ_hCUg,6561
+crackerjack/crackerjack.py,sha256=Vzt-oT989OJcw0He40BnnTUlmV8-siiZy5-a5fRjL1E,40046
+crackerjack/errors.py,sha256=QEPtVuMtKtQHuawgr1ToMaN1KbUg5h9-4mS33YB5Znk,4062
+crackerjack/interactive.py,sha256=y5QbyR2Wp8WkC_iC89ZqETm-wjAN9X5DK1L3yetpjN4,16153
 crackerjack/py313.py,sha256=buYE7LO11Q64ffowEhTZRFQoAGj_8sg3DTlZuv8M9eo,5890
-crackerjack/pyproject.toml,sha256=OIoNmIktC1abFPgePb95Zg9BDTGfRxXftK-KccWgalc,4988
-crackerjack-0.21.7.dist-info/RECORD,,
+crackerjack/pyproject.toml,sha256=CT9hhv56Ax8h1vljzxcEAn4s2wlQh1oZ0Iq3kiA6-m0,4988
+crackerjack-0.21.8.dist-info/RECORD,,