sarj-python-lint 1.66.0__tar.gz → 1.66.1__tar.gz

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 1.66.0
+Version: 1.66.1
 Summary: Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults
 Project-URL: Homepage, https://code-standards.sarj.ai/rules/python/
 Project-URL: Documentation, https://code-standards.sarj.ai/rules/python/

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sarj-python-lint"
-version = "1.66.0"
+version = "1.66.1"
 description = "Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults"
 readme = "README.md"
 authors = [{ name = "sarj-ai" }]

sarj_python_lint-1.66.1/src/sarj_python_lint/rules/_ast_names.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import ast
+
+
+def root_name(node: ast.expr) -> str | None:
+    while isinstance(node, ast.Attribute):
+        node = node.value
+    return node.id if isinstance(node, ast.Name) else None
+
+
+def expression_root(node: ast.expr) -> str | None:
+    while isinstance(node, (ast.Attribute, ast.Subscript)):
+        node = node.value
+    return node.id if isinstance(node, ast.Name) else None
+
+
+def terminal_name(node: ast.expr) -> str | None:
+    match node:
+        case ast.Name(id=name) | ast.Attribute(attr=name):
+            return name
+        case _:
+            return None
+
+
+def unqualified_name(node: ast.expr) -> str:
+    match node:
+        case ast.Name(id=name) | ast.Attribute(attr=name):
+            return name
+        case _:
+            return ""
+
+
+def dotted_parts(node: ast.expr) -> tuple[str, ...] | None:
+    parts: list[str] = []
+    current = node
+    while isinstance(current, ast.Attribute):
+        parts.append(current.attr)
+        current = current.value
+    if not isinstance(current, ast.Name):
+        return None
+    parts.append(current.id)
+    return tuple(reversed(parts))
+
+
+def dotted_name(node: ast.expr) -> str | None:
+    parts = dotted_parts(node)
+    return ".".join(parts) if parts is not None else None
+
+
+def assignment_names(node: ast.AST) -> set[str]:
+    match node:
+        case ast.Name(id=name):
+            return {name}
+        case ast.Tuple() | ast.List():
+            names: set[str] = set()
+            for element in node.elts:
+                names.update(assignment_names(element))
+            return names
+        case ast.Starred(value=value):
+            return assignment_names(value)
+        case _:
+            return set()

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/_closed_helpers.py

@@ -183,3 +183,13 @@ def _plain_decorator(
         and not (keyword.arg == "mode" and isinstance(keyword.value, ast.Constant) and keyword.value.value == "wrap")
         for keyword in decorator.keywords
     )
+
+
+def closed_owner(function: ast.FunctionDef | ast.AsyncFunctionDef, context: PythonFileContext) -> bool:
+    if not isinstance(function, ast.FunctionDef) or not function.name.startswith("_"):
+        return False
+    references = closed_references(context, function, context.resource_provenance)
+    return bool(references) and all(
+        (call := direct_call(reference, context)) is not None and call_matches(function, call)
+        for reference in references
+    )

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/_comments.py

@@ -326,7 +326,13 @@ class _Scan(NamedTuple):
     ordered: _Ordered
 
 
-_last_scan: tuple[str, _Scan] | None = None
+class _ScanMemo(NamedTuple):
+    source: str
+    scan: _Scan | None
+    comment_lines: frozenset[int] | None
+
+
+_last_scan: _ScanMemo | None = None
 
 
 def all_comments(source: str) -> _CommentScan[_Ordered]:
@@ -334,15 +340,35 @@ def all_comments(source: str) -> _CommentScan[_Ordered]:
     return _CommentScan(scan.ordered, scan.first_code_line)
 
 
+def comment_line_numbers(source: str) -> frozenset[int]:
+    global _last_scan  # ruff: ignore[global-statement] -- retain the existing single-source memo for both comment projections.
+    cached = _last_scan
+    scan = cached.scan if cached is not None and cached.source is source else None
+    if cached is not None and cached.source is source and cached.comment_lines is not None:
+        return cached.comment_lines
+    lines: frozenset[int]
+    if scan is not None:
+        lines = frozenset(comment.line for comment in scan.ordered)
+    else:
+        try:
+            tokens = tokenize.generate_tokens(io.StringIO(source).readline)
+            lines = frozenset(token.start[0] for token in tokens if token.type == tokenize.COMMENT)
+        except IndentationError, tokenize.TokenError:
+            lines = frozenset()
+    _last_scan = _ScanMemo(source, scan, lines)
+    return lines
+
+
 def _scan_memo(source: str) -> _Scan:
     global _last_scan  # ruff: ignore[global-statement] — single-slot memo; the CLI runs rules per file sequentially
-    if _last_scan is not None and _last_scan[0] is source:
-        return _last_scan[1]
+    cached = _last_scan if _last_scan is not None and _last_scan.source is source else None
+    if cached is not None and cached.scan is not None:
+        return cached.scan
     try:
         result = _scan(source)
     except UnicodeError:
         result = _Scan([], [], set(), 1 << 30, [])
-    _last_scan = (source, result)
+    _last_scan = _ScanMemo(source, result, cached.comment_lines if cached is not None else None)
     return result
 
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/_docstrings.py

@@ -13,9 +13,16 @@ if TYPE_CHECKING:
     from collections.abc import Iterable
 
     from sarj_python_lint.rules._ast_index import NodeIndex
+    from sarj_python_lint.rules._imports import ImportIndex
 
 
 _GETATTR_MIN_ARGS = 2
+_RUNTIME_DOC_DECORATORS = (
+    (frozenset({"agents"}), "function_tool"),
+    (frozenset({"click"}), "command"),
+    (frozenset({"typer"}), "command"),
+)
+_OVERLOAD_MODULES = frozenset({"typing", "typing_extensions"})
 
 # Docstring filler that says nothing about *which* thing is being described.
 _BASE_STOPWORDS = frozenset(
@@ -259,6 +266,18 @@ def decorator_markers(node: ast.FunctionDef | ast.AsyncFunctionDef | ast.ClassDe
     return markers
 
 
+def is_runtime_consumed_or_overload(node: ast.FunctionDef | ast.AsyncFunctionDef, imports: ImportIndex) -> bool:
+    if decorator_markers(node) & PROMPT_DECORATOR_MARKERS:
+        return True
+    for decorator in node.decorator_list:
+        target = decorator.func if isinstance(decorator, ast.Call) else decorator
+        if imports.resolves(target, sources=_OVERLOAD_MODULES, symbol="overload"):
+            return True
+        if any(imports.resolves(target, sources=sources, symbol=symbol) for sources, symbol in _RUNTIME_DOC_DECORATORS):
+            return True
+    return False
+
+
 def docstring_expression(
     node: ast.Module | ast.ClassDef | ast.FunctionDef | ast.AsyncFunctionDef,
 ) -> ast.Expr | None:

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/complex_postgres_query_requires_architecture_review.py

@@ -17,6 +17,7 @@ from sarj_python_lint.rule_base import (
     Severity,
 )
 from sarj_python_lint.rules._ast_index import nodes, walk
+from sarj_python_lint.rules._ast_names import unqualified_name as _call_name
 from sarj_python_lint.rules._paths import is_test_path
 from sarj_python_lint.rules._sql import is_store_module, sql_string_value, strip_sql_noise
 from sarj_python_lint.rules.no_analytical_aggregation_in_postgres_store import analytical_signal
@@ -148,14 +149,6 @@ def _query_argument(call: ast.Call) -> ast.expr | None:
     return next((keyword.value for keyword in call.keywords if keyword.arg in _QUERY_KEYWORDS), None)
 
 
-def _call_name(function: ast.expr) -> str:
-    match function:
-        case ast.Name(id=name) | ast.Attribute(attr=name):
-            return name
-        case _:
-            return ""
-
-
 def _postgres_sql_constructors(
     tree: ast.Module, parents: Mapping[ast.AST, ast.AST], *, node_index: NodeIndex | None = None
 ) -> frozenset[_ConstructorImport]:

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/docstring_args_restate_signature.py

@@ -20,13 +20,12 @@ from sarj_python_lint.rule_base import (
 from sarj_python_lint.rules._ast_index import children
 from sarj_python_lint.rules._comments import is_protected, stem
 from sarj_python_lint.rules._docstrings import (
-    PROMPT_DECORATOR_MARKERS,
     VALUE_MARKER_RE,
     annotation_tokens,
     arg_entries,
     arg_section,
-    decorator_markers,
     identifier_stems,
+    is_runtime_consumed_or_overload,
     restates,
 )
 
@@ -40,14 +39,6 @@ if TYPE_CHECKING:
 
 _ARGUMENT_CONSTRAINT_RE = re.compile(r"\b(available|current|existing|optional|required|supported)\b", re.IGNORECASE)
 
-_RUNTIME_DOC_DECORATORS = (
-    (frozenset({"agents"}), "function_tool"),
-    (frozenset({"click"}), "command"),
-    (frozenset({"typer"}), "command"),
-)
-
-_OVERLOAD_MODULES = frozenset({"typing", "typing_extensions"})
-
 
 @dataclass(frozen=True, slots=True)
 class _ParameterFacts:
@@ -151,7 +142,7 @@ class DocstringArgsRestateSignature(Rule):
         block = arg_section(docstring)
         if block is None or VALUE_MARKER_RE.search(block) or is_protected(block):
             return
-        if _is_runtime_consumed_or_overload(node, imports):
+        if is_runtime_consumed_or_overload(node, imports):
             return
         entries = arg_entries(block)
         if not entries:
@@ -202,15 +193,3 @@ def _parameter_stems(
         known = callable_stems | identifier_stems(argument.arg) | annotation_stems
         parameters[argument.arg] = _ParameterFacts(frozenset(known), frozenset(annotation_stems))
     return parameters
-
-
-def _is_runtime_consumed_or_overload(node: ast.FunctionDef | ast.AsyncFunctionDef, imports: ImportIndex) -> bool:
-    if decorator_markers(node) & PROMPT_DECORATOR_MARKERS:
-        return True
-    for decorator in node.decorator_list:
-        target = decorator.func if isinstance(decorator, ast.Call) else decorator
-        if imports.resolves(target, sources=_OVERLOAD_MODULES, symbol="overload"):
-            return True
-        if any(imports.resolves(target, sources=sources, symbol=symbol) for sources, symbol in _RUNTIME_DOC_DECORATORS):
-            return True
-    return False

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/docstring_returns_restate_signature.py

@@ -20,11 +20,10 @@ from sarj_python_lint.rule_base import (
 from sarj_python_lint.rules._ast_index import children
 from sarj_python_lint.rules._comments import is_protected, stem
 from sarj_python_lint.rules._docstrings import (
-    PROMPT_DECORATOR_MARKERS,
     VALUE_MARKER_RE,
     annotation_tokens,
-    decorator_markers,
     identifier_stems,
+    is_runtime_consumed_or_overload,
     restates,
     sections,
 )
@@ -51,12 +50,6 @@ _RESULT_SEMANTIC_RE = re.compile(
     re.IGNORECASE,
 )
 
-_RUNTIME_DOC_DECORATORS = (
-    (frozenset({"agents"}), "function_tool"),
-    (frozenset({"click"}), "command"),
-    (frozenset({"typer"}), "command"),
-)
-_OVERLOAD_MODULES = frozenset({"typing", "typing_extensions"})
 _GENERATOR_TYPES = frozenset({"AsyncGenerator", "AsyncIterable", "AsyncIterator", "Generator", "Iterable", "Iterator"})
 _BROAD_RETURN_TYPES = frozenset({"Any", "object"})
 
@@ -228,7 +221,7 @@ class DocstringReturnsRestateSignature(Rule):
             or _TYPED_RESULT_RE.search(block)
         ):
             return
-        if _is_runtime_consumed_or_overload(node, imports):
+        if is_runtime_consumed_or_overload(node, imports):
             return
         annotation = _result_annotation(node, section.name)
         if annotation is None or _is_broad_annotation(annotation):
@@ -313,15 +306,3 @@ def _contains_yield(node: ast.FunctionDef | ast.AsyncFunctionDef) -> bool:
 
 def _is_broad_annotation(annotation: ast.expr) -> bool:
     return _annotation_name(annotation) in _BROAD_RETURN_TYPES
-
-
-def _is_runtime_consumed_or_overload(node: ast.FunctionDef | ast.AsyncFunctionDef, imports: ImportIndex) -> bool:
-    if decorator_markers(node) & PROMPT_DECORATOR_MARKERS:
-        return True
-    for decorator in node.decorator_list:
-        target = decorator.func if isinstance(decorator, ast.Call) else decorator
-        if imports.resolves(target, sources=_OVERLOAD_MODULES, symbol="overload"):
-            return True
-        if any(imports.resolves(target, sources=sources, symbol=symbol) for sources, symbol in _RUNTIME_DOC_DECORATORS):
-            return True
-    return False

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_any_mapping_types.py

@@ -21,6 +21,7 @@ from sarj_python_lint.rule_base import (
 )
 from sarj_python_lint.rules._annotation_semantics import AnnotationSemantics, scope_bound_names
 from sarj_python_lint.rules._ast_index import walk as walk_ast
+from sarj_python_lint.rules._ast_names import expression_root as _expression_root
 from sarj_python_lint.rules._namespace_access import dynamic_namespace_access
 
 
@@ -568,12 +569,6 @@ def _type_attribute_mutation(call: ast.Call, imports: ImportIndex, sensitive: se
     return known and _expression_root(call.args[0]) in sensitive
 
 
-def _expression_root(node: ast.expr) -> str | None:
-    while isinstance(node, (ast.Attribute, ast.Subscript)):
-        node = node.value
-    return node.id if isinstance(node, ast.Name) else None
-
-
 def _unshadowed_type_expression(
     node: ast.expr, parents: Mapping[ast.AST, ast.AST], scope_cache: dict[int, frozenset[str]]
 ) -> bool:

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_contradictory_type_guard.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     Severity,
     is_suppressed,
 )
+from sarj_python_lint.rules._closed_helpers import executable_body
 from sarj_python_lint.rules._imports import TYPING_SOURCES
 from sarj_python_lint.rules._type_guard_symbols import (
     builtin_guard_symbol,
@@ -189,14 +190,7 @@ def _sole_parameter(function: ast.FunctionDef) -> ast.arg | None:
 
 
 def _single_return(function: ast.FunctionDef) -> ast.Return | None:
-    body = function.body
-    if (
-        body
-        and isinstance(body[0], ast.Expr)
-        and isinstance(body[0].value, ast.Constant)
-        and isinstance(body[0].value.value, str)
-    ):
-        body = body[1:]
+    body = executable_body(function)
     return body[0] if len(body) == 1 and isinstance(body[0], ast.Return) else None
 
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_generic_single_export_module.py

@@ -15,6 +15,7 @@ from sarj_python_lint.rule_base import (
     RuleExample,
 )
 from sarj_python_lint.rules._ast_index import walk as walk_ast
+from sarj_python_lint.rules._ast_names import unqualified_name as _annotation_name
 from sarj_python_lint.rules._exports import mentions_dunder_all
 
 
@@ -164,14 +165,6 @@ def _dunder_all_matches_primary(tree: ast.Module, primary_name: str) -> bool:
     return isinstance(entry, ast.Constant) and entry.value == primary_name
 
 
-def _annotation_name(node: ast.expr) -> str:
-    match node:
-        case ast.Name(id=name) | ast.Attribute(attr=name):
-            return name
-        case _:
-            return ""
-
-
 def _is_skipped_path(path: Path) -> bool:
     return "tests" in path.parts
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_hidden_constructor_fallback.py

@@ -368,15 +368,6 @@ def _directly_bound_names(statement: ast.stmt) -> set[str]:
             return set()
 
 
-def _argument_names(arguments: ast.arguments) -> set[str]:
-    names = {argument.arg for argument in (*arguments.posonlyargs, *arguments.args, *arguments.kwonlyargs)}
-    if arguments.vararg is not None:
-        names.add(arguments.vararg.arg)
-    if arguments.kwarg is not None:
-        names.add(arguments.kwarg.arg)
-    return names
-
-
 def _target_names(target: ast.expr) -> set[str]:
     if isinstance(target, ast.Name):
         return {target.id}

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_nested_pydantic_field_validator.py

@@ -14,6 +14,7 @@ from sarj_python_lint.rule_base import (
     RuleDocumentation,
     RuleExample,
 )
+from sarj_python_lint.rules._ast_names import root_name as _root_name
 from sarj_python_lint.rules._imports import ImportIndex
 from sarj_python_lint.rules._paths import is_test_path
 
@@ -237,12 +238,6 @@ def _shadowed_in_enclosing_function(
     return False
 
 
-def _root_name(node: ast.expr) -> str | None:
-    while isinstance(node, ast.Attribute):
-        node = node.value
-    return node.id if isinstance(node, ast.Name) else None
-
-
 def _function_binds(node: ast.FunctionDef | ast.AsyncFunctionDef | ast.Lambda, name: str) -> bool:
     arguments = node.args
     if (

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_partial_type_is.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     Severity,
     is_suppressed,
 )
+from sarj_python_lint.rules._closed_helpers import executable_body
 from sarj_python_lint.rules._imports import TYPING_SOURCES
 from sarj_python_lint.rules._type_guard_symbols import (
     builtin_guard_symbol,
@@ -211,14 +212,7 @@ def _partial_return(function: ast.FunctionDef, context: PythonFileContext) -> as
 
 
 def _single_return(function: ast.FunctionDef) -> ast.Return | None:
-    body = function.body
-    if (
-        body
-        and isinstance(body[0], ast.Expr)
-        and isinstance(body[0].value, ast.Constant)
-        and isinstance(body[0].value.value, str)
-    ):
-        body = body[1:]
+    body = executable_body(function)
     return body[0] if len(body) == 1 and isinstance(body[0], ast.Return) else None
 
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_positional_psycopg_row_escape.py

@@ -951,14 +951,6 @@ def _scope_bindings(function: ast.FunctionDef | ast.AsyncFunctionDef) -> frozens
     return frozenset(names)
 
 
-def _target_names(node: ast.expr) -> set[str]:
-    if isinstance(node, ast.Name):
-        return {node.id}
-    if isinstance(node, ast.Tuple | ast.List):
-        return {name for element in node.elts for name in _target_names(element)}
-    return set()
-
-
 def _position(node: ast.AST) -> AstPosition:
     return ast_position(node, missing=-1)
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_raw_source_text_test_oracle.py

@@ -20,6 +20,7 @@ from sarj_python_lint.rule_base import (
     is_suppressed,
 )
 from sarj_python_lint.rules._ast_index import comprehension_results, walk as walk_ast
+from sarj_python_lint.rules._ast_names import root_name as _root_name
 from sarj_python_lint.rules._imports import ImportIndex
 from sarj_python_lint.rules._paths import is_test_path
 
@@ -984,13 +985,6 @@ def _api_resolves(
     return root is not None and root not in api.shadowed and api.imports.resolves(node, sources=sources, symbol=symbol)
 
 
-def _root_name(node: ast.expr) -> str | None:
-    current = node
-    while isinstance(current, ast.Attribute):
-        current = current.value
-    return current.id if isinstance(current, ast.Name) else None
-
-
 def _is_source_open(
     node: ast.expr,
     path_names: set[str],

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_select_star.py

@@ -17,6 +17,7 @@ from sarj_python_lint.rule_base import (
     RuleExample,
 )
 from sarj_python_lint.rules._ast_index import walk
+from sarj_python_lint.rules._ast_names import unqualified_name as _call_name
 from sarj_python_lint.rules._paths import is_test_path
 from sarj_python_lint.rules._sql import POSTGRES_UNQUOTED_IDENTIFIER, sql_string_value, strip_sql_noise
 
@@ -280,11 +281,3 @@ def _is_query_binding(target: ast.expr) -> bool:
     name = target.id if isinstance(target, ast.Name) else target.attr
     tokens = frozenset(part for part in name.lower().split("_") if part)
     return name == "q" or name.isupper() or bool(tokens & _QUERY_BINDING_TOKENS)
-
-
-def _call_name(function: ast.expr) -> str:
-    match function:
-        case ast.Name(id=name) | ast.Attribute(attr=name):
-            return name
-        case _:
-            return ""

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_shallow_record_type_guard.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     Severity,
     is_suppressed,
 )
+from sarj_python_lint.rules._closed_helpers import executable_body
 from sarj_python_lint.rules._imports import TYPING_SOURCES
 from sarj_python_lint.rules._type_guard_symbols import (
     builtin_guard_symbol,
@@ -197,14 +198,7 @@ def _guard_record(
 
 
 def _single_return(function: ast.FunctionDef) -> ast.Return | None:
-    body = function.body
-    if (
-        body
-        and isinstance(body[0], ast.Expr)
-        and isinstance(body[0].value, ast.Constant)
-        and isinstance(body[0].value.value, str)
-    ):
-        body = body[1:]
+    body = executable_body(function)
     return body[0] if len(body) == 1 and isinstance(body[0], ast.Return) else None
 
 

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_typed_doc_sections.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     Severity,
     is_suppressed,
 )
+from sarj_python_lint.rules._ast_names import terminal_name as _terminal_name
 from sarj_python_lint.rules._prose_budget import groups
 
 
@@ -138,11 +139,3 @@ def _is_public_contract(node: ast.FunctionDef | ast.AsyncFunctionDef, parents: M
         _terminal_name(base) in _PUBLIC_CONTRACT_BASES for base in owner.bases
     )
     return not decorators.isdisjoint(_PUBLIC_CONTRACT_DECORATORS) or protocol_method
-
-
-def _terminal_name(node: ast.expr) -> str | None:
-    match node:
-        case ast.Name(id=name) | ast.Attribute(attr=name):
-            return name
-        case _:
-            return None

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/no_whole_request_response_payload_in_log.py

@@ -20,6 +20,7 @@ from sarj_python_lint.rule_base import (
     Severity,
 )
 from sarj_python_lint.rules._ast_index import object_list, walk as walk_ast
+from sarj_python_lint.rules._ast_names import expression_root as _root_name
 from sarj_python_lint.rules._logging import LOG_METHODS, is_logger_expr
 
 
@@ -382,12 +383,6 @@ def _mutated_names(statement: ast.stmt) -> frozenset[str]:
     return frozenset(names)
 
 
-def _root_name(node: ast.expr) -> str | None:
-    while isinstance(node, (ast.Attribute, ast.Subscript)):
-        node = node.value
-    return node.id if isinstance(node, ast.Name) else None
-
-
 def _containing_statement(node: ast.AST, parents: Mapping[ast.AST, ast.AST]) -> ast.stmt | None:
     current: ast.AST | None = node
     while current is not None and not isinstance(current, ast.stmt):

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/over_mocked_test.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     RuleExample,
     Severity,
 )
+from sarj_python_lint.rules._ast_names import dotted_name as _dotted
 from sarj_python_lint.rules._paths import is_test_path
 
 
@@ -809,18 +810,6 @@ def _joined_text(node: ast.JoinedStr) -> str:
     return "".join(parts)
 
 
-def _dotted(node: ast.expr) -> str | None:
-    parts: list[str] = []
-    current = node
-    while isinstance(current, ast.Attribute):
-        parts.append(current.attr)
-        current = current.value
-    if not isinstance(current, ast.Name):
-        return None
-    parts.append(current.id)
-    return ".".join(reversed(parts))
-
-
 def _collect_parametrized_names(argnames: ast.expr | None, parametrized: set[str]) -> None:
     if isinstance(argnames, ast.Constant) and isinstance(argnames.value, str):
         parametrized.update(stripped_name for name in argnames.value.split(",") if (stripped_name := name.strip()))

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/prefer_class_row.py

@@ -16,6 +16,7 @@ from sarj_python_lint.rule_base import (
     Severity,
 )
 from sarj_python_lint.rules._ast_index import walk as walk_ast
+from sarj_python_lint.rules._ast_names import expression_root as _target_root
 from sarj_python_lint.rules._paths import is_test_path
 
 
@@ -466,12 +467,6 @@ def _writes_name(node: ast.stmt, name: str) -> bool:
     return any(_target_root(target) == name for target in targets)
 
 
-def _target_root(node: ast.expr) -> str | None:
-    while isinstance(node, (ast.Attribute, ast.Subscript)):
-        node = node.value
-    return node.id if isinstance(node, ast.Name) else None
-
-
 def _dotted(node: ast.expr) -> str | None:
     parts: list[str] = []
     while isinstance(node, ast.Attribute):

{sarj_python_lint-1.66.0 → sarj_python_lint-1.66.1}/src/sarj_python_lint/rules/prefer_collection_comprehension.py

@@ -4,10 +4,8 @@ import ast
 from collections import defaultdict
 from dataclasses import dataclass
 from enum import StrEnum
-from io import StringIO
 from itertools import pairwise
 from pathlib import PurePosixPath
-import tokenize
 from typing import TYPE_CHECKING, ClassVar, final, override
 
 from sarj_python_lint.rule_base import (
@@ -23,6 +21,7 @@ from sarj_python_lint.rule_base import (
     is_suppressed,
 )
 from sarj_python_lint.rules._ast_index import children, walk as walk_ast
+from sarj_python_lint.rules._comments import comment_line_numbers
 
 
 if TYPE_CHECKING:
@@ -243,7 +242,6 @@ class PreferCollectionComprehension(Rule):
     @override
     def check_context(self, context: PythonFileContext) -> list[Diagnostic]:
         path = context.path
-        source = context.source
         if context.generated:
             return []
         tree = context.tree
@@ -251,7 +249,7 @@ class PreferCollectionComprehension(Rule):
             return []
 
         source_lines = context.source_lines
-        comments = _comment_lines(source)
+        comments = comment_line_numbers(context.source)
         diagnostics: list[Diagnostic] = []
         set_shadowed = _set_is_shadowed(tree, node_index=context.node_index)
         namespace_observers = _namespace_observer_calls(context)
@@ -834,14 +832,6 @@ def _replacement_fits(init: _Init, name: str, expression: str, *, allow_multilin
     )
 
 
-def _comment_lines(source: str) -> frozenset[int]:
-    try:
-        tokens = tokenize.generate_tokens(StringIO(source).readline)
-        return frozenset(token.start[0] for token in tokens if token.type == tokenize.COMMENT)
-    except IndentationError, tokenize.TokenError:
-        return frozenset()
-
-
 def _has_comment(init: _Init, loop: ast.For, comments: frozenset[int]) -> bool:
     end_line = loop.end_lineno or loop.lineno
     return any(init.lineno <= line <= end_line for line in comments)