sarj-python-lint 1.74.0__tar.gz → 1.74.2__tar.gz

{sarj_python_lint-1.74.0 → sarj_python_lint-1.74.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 1.74.0
+Version: 1.74.2
 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.74.0 → sarj_python_lint-1.74.2}/pyproject.toml

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

{sarj_python_lint-1.74.0 → sarj_python_lint-1.74.2}/src/sarj_python_lint/rules/_local_alias_fix.py

@@ -16,6 +16,7 @@ if TYPE_CHECKING:
     from sarj_python_lint._file_context import PythonFileContext
 
 
+_ALIAS_RETURN_LENGTH = 2
 _NAMESPACE_MUTATORS = frozenset(
     {
         "setattr",
@@ -86,9 +87,9 @@ class LocalAliasFixes:
         if not isinstance(source, ast.Name) or parameters[0].arg != source.id:
             return ()
         body = owner.body[1:] if ast.get_docstring(owner) is not None else owner.body
-        if body[:1] != [assignment] or len(body[1:]) != 1 or not isinstance(body[-1], ast.Return):
+        if len(body) != _ALIAS_RETURN_LENGTH or body[0] is not assignment or not isinstance(body[1], ast.Return):
             return ()
-        call = body[-1].value
+        call = body[1].value
         if not isinstance(call, ast.Call) or not isinstance(call.func, ast.Name) or call.func.id != "dict":
             return ()
         if call.args or len(call.keywords) != 1 or call.keywords[0].value is not use or not self._available:
@@ -110,14 +111,8 @@ class LocalAliasFixes:
             return ()
         if assignment.end_lineno != assignment.lineno:
             return ()
-        line = self.context.source_lines[assignment.lineno - 1]
         raw = self._lines[assignment.lineno - 1]
-        if (
-            raw[: assignment.col_offset].strip()
-            or raw[assignment.end_col_offset :].strip()
-            or ";" in line
-            or "\\" in line
-        ):
+        if raw[: assignment.col_offset].strip() or raw[assignment.end_col_offset :].strip():
             return ()
         return (
             TextEdit(assignment.lineno, 1, assignment.lineno + 1, 1, ""),

{sarj_python_lint-1.74.0 → sarj_python_lint-1.74.2}/src/sarj_python_lint/rules/_resource_provenance.py

@@ -428,7 +428,7 @@ class ResourceProvenance:
             name = binding.id if isinstance(binding, ast.Name) else binding.name
             if name in self.mutated or name in self.external_bindings:
                 return False
-            for read in self._binding_reads(name, binding):
+            for read in self.binding_reads(name, binding):
                 alias = self._function_alias(read)
                 if alias is not None:
                     pending.append(alias)
@@ -469,7 +469,7 @@ class ResourceProvenance:
             and any(self.imported(constructor.func, f"contextlib.{kind}") for kind in ("ExitStack", "AsyncExitStack"))
         )
 
-    def _binding_reads(self, name: str, binding: ast.AST) -> list[ast.Name]:
+    def binding_reads(self, name: str, binding: ast.AST) -> list[ast.Name]:
         return self._indexed_reads(name, binding, cache=self._reads_by_binding, resolve=self.binding)
 
     def _indexed_reads(
@@ -496,7 +496,7 @@ class ResourceProvenance:
         if key not in self.escape_cache:
             self.escape_cache[key] = all(
                 self._method_or_context_read(read, allow_context=allow_context)
-                for read in self._binding_reads(name.id, binding)
+                for read in self.binding_reads(name.id, binding)
             )
         return self.escape_cache[key]
 

{sarj_python_lint-1.74.0 → sarj_python_lint-1.74.2}/src/sarj_python_lint/rules/no_redundant_local_alias.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import ast
-from collections import defaultdict
 from pathlib import PurePosixPath
 import re
 from typing import TYPE_CHECKING, ClassVar, final, override
@@ -96,6 +95,7 @@ class NoRedundantLocalAlias(Rule):
             "Loops, try statements, asserts, other Boolean short-circuiting, nested scopes, global/nonlocal declarations and type aliases are excluded. Ordinary and async with bodies require ordered enclosing-suite binding evidence.",
             "A conditional expression is admitted only when its test is a bare name bound once as a parameter, and neither local is read within the expression.",
             "Typed aliases, files with type comments, same-scope quoted references and conditional reads of either local are excluded. Captured bindings and module/class aliases are preserved.",
+            "Aliases read inside template interpolations are preserved because templates expose expression text. This conservatively also excludes reads used only in format specifications.",
             "Files with wildcard imports, Pydantic imports or references to known namespace readers, dynamic attribute getters or reference-count observers are excluded. Wildcard exports cannot establish builtin identity; computed type names can consume caller-local bindings without a Name read in the AST.",
             "Dynamic class construction and class-valued references to type are excluded. Direct, unshadowed unary type(value) queries and standard-library dataclasses remain supported.",
             "Generated source, stubs and malformed input are excluded; files must compile with normal module execution flags. Arbitrary external frame introspection is not modeled.",
@@ -193,7 +193,6 @@ class NoRedundantLocalAlias(Rule):
             return []
         provenance = context.resource_provenance
         names = {node.targets[0].id for node in candidates if isinstance(node.targets[0], ast.Name)}
-        reads = _scope_reads(provenance, names)
         conditional_sources = _conditional_sources(context)
         quoted = _quoted_references(context, provenance, names)
         positions = {statement: i for owner in context.nodes(*_SUITES) for i, statement in enumerate(owner.body)}
@@ -206,7 +205,7 @@ class NoRedundantLocalAlias(Rule):
                 continue
             if (provenance.scope(assignment), target.id) in quoted:
                 continue
-            use = _single_keyword_read(target, provenance, reads, keywords)
+            use = _single_keyword_read(target, provenance, keywords)
             if use is None:
                 continue
             if not _dominates(assignment, use, context.parents, positions):
@@ -364,14 +363,6 @@ def _parameter_choice(node: ast.IfExp, provenance: ResourceProvenance) -> bool:
     return len(bindings) == 1 and isinstance(bindings[0], ast.arg)
 
 
-def _scope_reads(provenance: ResourceProvenance, names: set[str]) -> dict[tuple[ast.AST | None, str], list[ast.Name]]:
-    reads: dict[tuple[ast.AST | None, str], list[ast.Name]] = defaultdict(list)
-    for name in names:
-        for read in provenance.reads.get(name, ()):
-            reads[provenance.scope(read), name].append(read)
-    return reads
-
-
 def _conditional_sources(context: PythonFileContext) -> set[tuple[ast.AST | None, str]]:
     provenance = context.resource_provenance
     pending: list[ast.AST] = list(context.nodes(ast.IfExp))
@@ -391,12 +382,13 @@ def _conditional_sources(context: PythonFileContext) -> set[tuple[ast.AST | None
 def _single_keyword_read(
     target: ast.Name,
     provenance: ResourceProvenance,
-    reads: Mapping[tuple[ast.AST | None, str], list[ast.Name]],
     keywords: Mapping[ast.Name, str],
 ) -> ast.Name | None:
     scope = provenance.scope(target)
-    uses = reads.get((scope, target.id), ())
-    if provenance.bindings.get(scope, {}).get(target.id) != [target] or len(uses) != 1:
+    if provenance.bindings.get(scope, {}).get(target.id) != [target]:
+        return None
+    uses = provenance.binding_reads(target.id, target)
+    if len(uses) != 1:
         return None
     [use] = uses
     if keywords.get(use) != target.id or _statement(use, provenance.parents) is None:
@@ -481,7 +473,7 @@ def _plain_type_query(node: ast.AST, context: PythonFileContext) -> bool:
 
 def _statement(node: ast.AST, parents: Mapping[ast.AST, ast.AST]) -> ast.stmt | None:
     while not isinstance(node, ast.stmt):
-        if isinstance(node, (ast.IfExp, ast.BoolOp)) or (parent := parents.get(node)) is None:
+        if isinstance(node, (ast.IfExp, ast.BoolOp, ast.Interpolation)) or (parent := parents.get(node)) is None:
             return None
         node = parent
     return node