wexample-filestate-python 6.8.7__tar.gz → 7.0.0__tar.gz

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-filestate-python
-Version: 6.8.7
+Version: 7.0.0
 Summary: Helpers for Python.
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -19,8 +19,8 @@ Requires-Dist: libcst
 Requires-Dist: packaging
 Requires-Dist: pyupgrade
 Requires-Dist: tomli
-Requires-Dist: wexample-api>=6.3.0
-Requires-Dist: wexample-filestate>=12.1.0
+Requires-Dist: wexample-api>=6.4.0
+Requires-Dist: wexample-filestate>=12.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 # filestate_python
 
-Version: 6.8.7
+Version: 7.0.0
 
 Helpers for Python.
 
@@ -118,8 +118,8 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - packaging: 
 - pyupgrade: 
 - tomli: 
-- wexample-api: >=6.3.0
-- wexample-filestate: >=12.1.0
+- wexample-api: >=6.4.0
+- wexample-filestate: >=12.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/README.md

@@ -1,6 +1,6 @@
 # filestate_python
 
-Version: 6.8.7
+Version: 7.0.0
 
 Helpers for Python.
 
@@ -90,8 +90,8 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - packaging: 
 - pyupgrade: 
 - tomli: 
-- wexample-api: >=6.3.0
-- wexample-filestate: >=12.1.0
+- wexample-api: >=6.4.0
+- wexample-filestate: >=12.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-filestate-python"
-version = "6.8.7"
+version = "7.0.0"
 description = "Helpers for Python."
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -28,8 +28,8 @@ dependencies = [
     "packaging",
     "pyupgrade",
     "tomli",
-    "wexample-api>=6.3.0",
-    "wexample-filestate>=12.1.0",
+    "wexample-api>=6.4.0",
+    "wexample-filestate>=12.2.0",
 ]
 
 [project.readme]

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/config_option/mixin/with_stdout_wrapping_mixin.py

@@ -35,12 +35,8 @@ class WithStdoutWrappingMixin:
             stderr_content = captured_stderr.getvalue()
 
             if stdout_content.strip():
-                sys.stdout.write(stdout_content.rstrip())
-                sys.stdout.write("\n")
-                sys.stdout.write("\n")
+                sys.stdout.write(stdout_content.rstrip() + "\n\n")
             if stderr_content.strip():
-                sys.stderr.write(stderr_content.rstrip())
-                sys.stderr.write("\n")
-                sys.stderr.write("\n")
+                sys.stderr.write(stderr_content.rstrip() + "\n\n")
 
         return result

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/helpers/package.py

@@ -20,9 +20,10 @@ def package_get_dependencies(root_dir: str | Path) -> dict[str, set[str]]:
         raise ValueError(f"Error: {packages_root} does not exist or is not a directory")
 
     dependencies = {}
+    all_entries = list(packages_root.iterdir())
 
     # First pass: collect all local packages
-    for package_dir in packages_root.iterdir():
+    for package_dir in all_entries:
         if not package_dir.is_dir():
             continue
 
@@ -32,7 +33,7 @@ def package_get_dependencies(root_dir: str | Path) -> dict[str, set[str]]:
             dependencies[name] = set()
 
     # Second pass: analyze dependencies
-    for package_dir in packages_root.iterdir():
+    for package_dir in all_entries:
         if not package_dir.is_dir():
             continue
 
@@ -94,11 +95,15 @@ def package_parse_setup(path: Path) -> dict:
         ):
             result = {}
             for kw in node.keywords:
-                if isinstance(kw.value, ast.Str):
-                    result[kw.arg] = kw.value.s
+                if isinstance(kw.value, ast.Constant) and isinstance(
+                    kw.value.value, str
+                ):
+                    result[kw.arg] = kw.value.value
                 elif isinstance(kw.value, ast.List):
                     result[kw.arg] = [
-                        elt.s for elt in kw.value.elts if isinstance(elt, ast.Str)
+                        elt.value
+                        for elt in kw.value.elts
+                        if isinstance(elt, ast.Constant) and isinstance(elt.value, str)
                     ]
             return result
     return {}

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/helpers/toml.py

@@ -49,7 +49,7 @@ def toml_ensure_table(doc: Any, path: list[str]) -> tuple[Any, bool]:
     current = doc
     for key in path:
         tbl = current.get(key) if isinstance(current, dict) else None
-        if not tbl or not isinstance(tbl, dict):
+        if tbl is None or not isinstance(tbl, dict):
             tbl = table()
             current[key] = tbl
             changed = True
@@ -96,21 +96,16 @@ def toml_sort_string_array(arr: Any) -> bool:
     if not items or not all(isinstance(i, String) for i in items):
         return False
 
-    values = [i.value for i in items]
-    sorted_items = [
-        x
-        for _, x in sorted(zip([v.lower() for v in values], items), key=lambda t: t[0])
-    ]
+    sorted_items = sorted(items, key=lambda i: i.value.lower())
 
     if items == sorted_items:
         return False
 
-    multiline_flag = getattr(arr, "multiline", None)
+    multiline_flag = arr._multiline
     # Clear and re-append to preserve tomlkit item identity
-    while len(arr):
+    while arr:
         arr.pop()
     for item in sorted_items:
         arr.append(item)
-    if multiline_flag is not None:
-        arr.multiline(multiline_flag)
+    arr.multiline(multiline_flag)
     return True

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/add_future_annotations_option.py

@@ -70,7 +70,7 @@ class AddFutureAnnotationsOption(AbstractPythonFileContentOption):
         # If there isn't a blank line after the future import and next line is not blank, add one for readability
         j = insert_index + 1
         if j < len(lines):
-            if lines[j].strip() != "":
+            if lines[j].strip():
                 lines.insert(j, "\n")
 
         return "".join(lines)

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/add_return_types_option.py

@@ -58,9 +58,6 @@ class AddReturnTypesOption(AbstractPythonFileContentOption):
             def visit_FunctionDef(self, node: cst.FunctionDef) -> bool:  # type: ignore[override]
                 return False
 
-            def visit_AsyncFunctionDef(self, node: cst.AsyncFunctionDef) -> bool:  # type: ignore[override]
-                return False
-
             def visit_Lambda(self, node: cst.Lambda) -> bool:  # type: ignore[override]
                 return False
 
@@ -145,9 +142,6 @@ class AddReturnTypesOption(AbstractPythonFileContentOption):
             def visit_FunctionDef(self, node: cst.FunctionDef) -> bool:  # type: ignore[override]
                 return False
 
-            def visit_AsyncFunctionDef(self, node: cst.AsyncFunctionDef) -> bool:  # type: ignore[override]
-                return False
-
             def visit_ClassDef(self, node: cst.ClassDef) -> bool:  # type: ignore[override]
                 return False
 
@@ -197,26 +191,19 @@ class AddReturnTypesOption(AbstractPythonFileContentOption):
 
                 return None
 
-            def _infer_for_function(self, func_node: cst.BaseFunctionDef) -> str | None:
+            def _infer_for_function(self, func_node: cst.FunctionDef) -> str | None:
                 # Collect returns in the function body (non-nested)
                 collector = _ReturnCollector()
-                # Visit only the immediate body of the function
-                if isinstance(func_node, cst.FunctionDef):
-                    func_node.body.visit(collector)
-                elif isinstance(func_node, cst.AsyncFunctionDef):
-                    func_node.body.visit(collector)
-                else:
+                if not isinstance(func_node, cst.FunctionDef):
                     return None
+                func_node.body.visit(collector)
                 # If no return statements -> None
                 if not collector.returns:
                     return "None"
 
                 # Build a simple assignment map within the function
                 fac = _FunctionAssignCollector(self.known_types)
-                if isinstance(func_node, cst.FunctionDef):
-                    func_node.body.visit(fac)
-                elif isinstance(func_node, cst.AsyncFunctionDef):
-                    func_node.body.visit(fac)
+                func_node.body.visit(fac)
 
                 kinds: set[str] = set()
                 for r in collector.returns:
@@ -245,19 +232,6 @@ class AddReturnTypesOption(AbstractPythonFileContentOption):
                         )
                 return updated_node
 
-            def leave_AsyncFunctionDef(
-                self,
-                original_node: cst.AsyncFunctionDef,
-                updated_node: cst.AsyncFunctionDef,
-            ) -> cst.AsyncFunctionDef:
-                if updated_node.returns is None:
-                    rtype = self._infer_for_function(original_node)
-                    if rtype is not None:
-                        return updated_node.with_changes(
-                            returns=cst.Annotation(annotation=cst.Name(rtype))
-                        )
-                return updated_node
-
         # Collect known simple type names from the module
         ktc = _KnownTypesCollector()
         module.visit(ktc)

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/order_module_docstring_option.py

@@ -43,9 +43,7 @@ class OrderModuleDocstringOption(AbstractPythonFileContentOption):
 
         if is_module_docstring_at_top(module):
             # Check if quotes need normalization
-            if len(docstring_node.body) > 0 and isinstance(
-                docstring_node.body[0], cst.Expr
-            ):
+            if docstring_node.body and isinstance(docstring_node.body[0], cst.Expr):
                 expr = docstring_node.body[0]
                 if isinstance(expr.value, cst.SimpleString):
                     quote = expr.value.quote

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/order_module_metadata_option.py

@@ -48,7 +48,7 @@ class OrderModuleMetadataOption(AbstractPythonFileContentOption):
         )
         # names sorted?
         names = [name for _, __, name in found]
-        names_sorted = sorted(names, key=lambda n: n.lower())
+        names_sorted = sorted(names, key=str.lower)
         already_sorted = names == names_sorted
         # at correct position?
         desired_index = target_index_for_module_metadata(module)

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/order_type_checking_block_option.py

@@ -41,8 +41,8 @@ class OrderTypeCheckingBlockOption(AbstractPythonFileContentOption):
         current_indices = [i for i, _ in blocks]
         desired_index = target_index_for_type_checking(module)
         # Already correct if first block starts at desired index and blocks are contiguous
-        contiguous = current_indices == list(
-            range(current_indices[0], current_indices[0] + len(current_indices))
+        contiguous = all(
+            b - a == 1 for a, b in zip(current_indices, current_indices[1:])
         )
         if contiguous and current_indices[0] == desired_index:
             return src

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python/relocate_imports_option.py

@@ -88,11 +88,7 @@ class RelocateImportsOption(AbstractPythonFileContentOption):
         runtime_used_anywhere: set[str] = rsc.runtime_used_anywhere
 
         # Resolve categories
-        runtime_local_all: set[str] = (
-            set().union(*functions_needing_local.values())
-            if functions_needing_local
-            else set()
-        )
+        runtime_local_all: set[str] = set().union(*functions_needing_local.values())
         # class_level has priority over runtime_local: if a name is class-level, we do NOT local-import it
         runtime_local_final: set[str] = {
             n for n in runtime_local_all if n not in class_level_names
@@ -114,9 +110,7 @@ class RelocateImportsOption(AbstractPythonFileContentOption):
         # Then subtract names that are already locally imported inside some function where
         # they are used (to avoid redundant TYPE_CHECKING imports when a function-scoped
         # import suffices, e.g., `from multiprocessing import Queue` inside a method).
-        annotation_names_candidate: set[str] = {
-            n for n in type_annotation_names if n not in class_level_names
-        }
+        annotation_names_candidate: set[str] = type_annotation_names - class_level_names
 
         # Collect names imported locally inside functions anywhere in the module
         class _LocalImportNameCollector(cst.CSTVisitor):
@@ -157,19 +151,15 @@ class RelocateImportsOption(AbstractPythonFileContentOption):
         # - remove module-level import unless also class_level or runtime_used_anywhere
         # Exclude names used at runtime at module level (e.g., TerminalColor.RED in dict values)
         names_to_remove_from_module = (
-            (set(runtime_local_final) - runtime_used_anywhere)
-            | set(type_only_names)
-            | (
-                set(cast_type_names_anywhere)
-                - set(class_level_names)
-                - runtime_used_anywhere
-            )
+            (runtime_local_final - runtime_used_anywhere)
+            | type_only_names
+            | (cast_type_names_anywhere - class_level_names - runtime_used_anywhere)
         )
 
         # Do not add to TYPE_CHECKING if the name's module-level import is kept
-        kept_module_imports: set[str] = {
-            n for n in imported_value_names if n not in names_to_remove_from_module
-        }
+        kept_module_imports: set[str] = (
+            imported_value_names - names_to_remove_from_module
+        )
         used_in_C_only_final: set[str] = set(type_only_for_block) - kept_module_imports
 
         # Debug summary removed

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/option/python_option.py

@@ -130,9 +130,6 @@ class PythonOption(OptionMixin, AbstractNestedConfigOption):
     def set_value(self, raw_value: Any) -> None:
         # Convert list form to dict form for consistency
         if isinstance(raw_value, list):
-            dict_value = {}
-            for option_name in raw_value:
-                dict_value[option_name] = True
-            raw_value = dict_value
+            raw_value = {option_name: True for option_name in raw_value}
 
         super().set_value(raw_value=raw_value)

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_attrs_utils.py

@@ -39,19 +39,19 @@ def fix_attrs_kw_only(module: cst.Module) -> cst.Module:
                     return updated_node.with_changes(decorator=new_call)
                 else:
                     # Check if kw_only is set to False and change it to True
-                    new_args = []
-                    for arg in call.args:
-                        if (
-                            isinstance(arg.keyword, cst.Name)
-                            and arg.keyword.value == "kw_only"
-                            and isinstance(arg.value, cst.Name)
-                            and arg.value.value == "False"
-                        ):
-                            # Change False to True
-                            new_arg = arg.with_changes(value=cst.Name("True"))
-                            new_args.append(new_arg)
-                        else:
-                            new_args.append(arg)
+                    new_args = [
+                        (
+                            arg.with_changes(value=cst.Name("True"))
+                            if (
+                                isinstance(arg.keyword, cst.Name)
+                                and arg.keyword.value == "kw_only"
+                                and isinstance(arg.value, cst.Name)
+                                and arg.value.value == "False"
+                            )
+                            else arg
+                        )
+                        for arg in call.args
+                    ]
 
                     if new_args != list(call.args):
                         new_call = call.with_changes(args=new_args)
@@ -76,10 +76,10 @@ def fix_attrs_kw_only(module: cst.Module) -> cst.Module:
 
 def _has_kw_only_arg(call: cst.Call) -> bool:
     """Check if the call already has a kw_only argument."""
-    for arg in call.args:
-        if isinstance(arg.keyword, cst.Name) and arg.keyword.value == "kw_only":
-            return True
-    return False
+    return any(
+        isinstance(arg.keyword, cst.Name) and arg.keyword.value == "kw_only"
+        for arg in call.args
+    )
 
 
 def _is_attrs_decorator(decorator: cst.Decorator) -> bool:
@@ -99,8 +99,7 @@ def _is_attrs_decorator(decorator: cst.Decorator) -> bool:
         ):
             return True
 
-    # Check for @attr.s
-    if isinstance(base_decorator, cst.Attribute):
+        # Check for @attr.s
         if (
             isinstance(base_decorator.value, cst.Name)
             and base_decorator.value.value == "attr"

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_blank_lines_utils.py

@@ -142,10 +142,11 @@ def _fix_module_docstring_spacing(module: cst.Module) -> cst.Module:
         # Count existing blank lines after docstring
         blank_count = 0
         if isinstance(next_stmt, cst.SimpleStatementLine):
-            # Count blank leading_lines
-            for line in next_stmt.leading_lines:
-                if isinstance(line, cst.EmptyLine) and line.comment is None:
-                    blank_count += 1
+            blank_count = sum(
+                1
+                for line in next_stmt.leading_lines
+                if isinstance(line, cst.EmptyLine) and line.comment is None
+            )
 
         # Ensure exactly 1 blank line
         if blank_count != 1:

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_class_attributes_utils.py

@@ -84,7 +84,9 @@ def reorder_attribute_block(
 
     def cat(node: cst.CSTNode) -> tuple:
         name = _attr_name(node) or ""
-        if _is_special_attribute(node):
+        if name in SPECIAL_ATTR_NAMES or (
+            isinstance(node, cst.ClassDef) and name in SPECIAL_INNER_CLASS_NAMES
+        ):
             # Category 0: special always first
             return (0, _sort_key(name), False)
         if dataclass_mode:

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_class_docstring_utils.py

@@ -28,8 +28,7 @@ def find_class_docstring_nodes(
     According to Python conventions, a class docstring is a first statement that's a
     string literal expression. We detect any top-level string literal in the class body.
     """
-    body_elems = list(classdef.body.body)
-    for i, elem in enumerate(body_elems):
+    for i, elem in enumerate(classdef.body.body):
         if isinstance(elem, cst.SimpleStatementLine) and len(elem.body) == 1:
             small = elem.body[0]
             if isinstance(small, cst.Expr) and isinstance(
@@ -76,7 +75,7 @@ def normalize_docstring_quotes_stmt(
     if not (isinstance(small, cst.Expr) and isinstance(small.value, cst.SimpleString)):
         return stmt
     q = small.value.quote
-    if q.startswith('"""') or q.startswith('"'):
+    if q.startswith('"'):
         return stmt
     # Convert starting quote to double
     new_quote = '"""' if q.startswith("'''") else '"'

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_class_methods_utils.py

@@ -22,6 +22,8 @@ for gi, group in enumerate(DUnderGroups):
     for si, name in enumerate(group):
         _DUNDER_ORDER[name] = (gi, si)
 
+_PROP_KINDS: tuple[str, str, str] = ("getter", "setter", "deleter")
+
 
 def ensure_order_class_methods_in_module(module: cst.Module) -> cst.Module:
     changed = False
@@ -86,7 +88,7 @@ def reorder_class_methods(classdef: cst.ClassDef) -> cst.ClassDef:
     # Order dunders by (group, within) then keep unknown dunders after known, alpha by name
     known = [m for m in dunders if m["order"][0] != 999]
     unknown = [m for m in dunders if m["order"][0] == 999]
-    known_sorted = sorted(known, key=lambda m: (m["order"][0], m["order"][1]))
+    known_sorted = sorted(known, key=lambda m: m["order"])
     unknown_sorted = sorted(unknown, key=lambda m: _sort_key_alpha(m["name"]))
     dunder_ordered = [m["node"] for m in known_sorted + unknown_sorted]
 
@@ -118,17 +120,10 @@ def reorder_class_methods(classdef: cst.ClassDef) -> cst.ClassDef:
         g[kind] = node
 
     def prop_group_to_nodes(base: str, g: dict[str, cst.FunctionDef | None]):
-        order = []
-        if g.get("getter") is not None:
-            order.append(g["getter"])  # type: ignore
-        if g.get("setter") is not None:
-            order.append(g["setter"])  # type: ignore
-        if g.get("deleter") is not None:
-            order.append(g["deleter"])  # type: ignore
-        return order
+        return [g[k] for k in _PROP_KINDS if g[k] is not None]  # type: ignore
 
     props_ordered: list[cst.FunctionDef] = []
-    for base in sorted(prop_groups.keys(), key=lambda n: n.lower()):
+    for base in sorted(prop_groups.keys(), key=str.lower):
         props_ordered.extend(prop_group_to_nodes(base, prop_groups[base]))
 
     # Final ordered list: dunder -> classmethods -> staticmethods -> properties -> instances
@@ -219,9 +214,7 @@ def _property_kind(func: cst.FunctionDef) -> tuple[str | None, str | None]:
                 # base name is left side of the attribute if it's a Name
                 base = expr.value
                 if isinstance(base, cst.Name):
-                    return base.value, (
-                        "setter" if expr.attr.value == "setter" else "deleter"
-                    )
+                    return base.value, expr.attr.value
     return None, None
 
 

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_constants_utils.py

@@ -27,11 +27,12 @@ def find_flagged_constant_blocks(
 
     i = 0
     body = module.body
+    body_list = list(body)
     n = len(body)
     while i < n:
         stmt = body[i]
         if isinstance(stmt, cst.SimpleStatementLine):
-            has_flag = _stmt_has_flag(stmt, src) or _prev_line_has_flag(list(body), i)
+            has_flag = _stmt_has_flag(stmt, src) or _prev_line_has_flag(body_list, i)
             if has_flag and _get_simple_assignment_name(stmt) is not None:
                 # Start a block at i
                 j = i
@@ -187,17 +188,15 @@ def sort_constants_block(
             collected_flag_lines = fl
             break
 
-    pairs: list[tuple[str, cst.SimpleStatementLine]] = []
-    for node in nodes:
-        name = _get_simple_assignment_name(node)
-        if name is None:
-            # Shouldn't happen given precondition
-            continue
-        pairs.append((name, node))
+    pairs = [
+        (name, node)
+        for node in nodes
+        if (name := _get_simple_assignment_name(node)) is not None
+    ]
 
     # If already sorted, return original (no changes)
     sorted_pairs = sorted(pairs, key=lambda p: p[0].lower())
-    if [n for _, n in sorted_pairs] == [n for _, n in pairs]:
+    if all(a is b for (_, a), (_, b) in zip(sorted_pairs, pairs)):
         return nodes
 
     # Build new nodes preserving each node's original leading_lines, but move the

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_docstring_utils.py

@@ -112,6 +112,6 @@ def normalize_docstring_quotes(
     # Create new string with double quotes
     new_string = string_value.with_changes(quote=new_quote)
     new_expr = expr.with_changes(value=new_string)
-    new_body = [new_expr] + list(docstring_node.body[1:])
+    new_body = [new_expr, *docstring_node.body[1:]]
 
     return docstring_node.with_changes(body=new_body)

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_functions_utils.py

@@ -79,7 +79,7 @@ def reorder_module_functions(module: cst.Module) -> cst.Module:
     remove_indices = []
     for idx, g in groups_with_idx:
         remove_indices.extend(range(idx, idx + len(g.nodes)))
-    remove_indices = sorted(set(remove_indices))
+    remove_indices = set(remove_indices)
 
     new_body: list[cst.CSTNode] = []
     for idx, node in enumerate(module.body):

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_iterable_utils.py

@@ -71,9 +71,7 @@ def reorder_flagged_iterables(src: str) -> str:
             continue
 
         # Flatten groups back to lines
-        new_block: list[str] = []
-        for g in sorted_groups:
-            new_block.extend(g)
+        new_block = [ln for g in sorted_groups for ln in g]
 
         lines[start:end] = new_block
         changed = True
@@ -111,7 +109,7 @@ def _collect_iterable_block(lines: list[str], flag_idx: int) -> tuple[int, int]:
         if stripped.startswith("]") and curr_indent <= base_indent:
             break
         # Stop if we encounter a trailing comment-only line
-        if lines[i].lstrip().startswith("#"):
+        if stripped.startswith("#"):
             break
         i += 1
 
@@ -124,8 +122,4 @@ def _find_flag_line_indices(src: str) -> list[int]:
     from wexample_filestate.helpers.flag import flag_exists
 
     lines = src.splitlines()
-    indices: list[int] = []
-    for i, line in enumerate(lines):
-        if flag_exists(FLAG_NAME, line):
-            indices.append(i)
-    return indices
+    return [i for i, line in enumerate(lines) if flag_exists(FLAG_NAME, line)]

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_main_guard_utils.py

@@ -5,11 +5,7 @@ import libcst as cst
 
 def find_main_guard_blocks(module: cst.Module) -> list[tuple[int, cst.If]]:
     """Return list of (index, IfNode) for all top-level __main__ guard blocks."""
-    res: list[tuple[int, cst.If]] = []
-    for i, stmt in enumerate(module.body):
-        if is_main_guard_if(stmt):
-            res.append((i, stmt))
-    return res
+    return [(i, stmt) for i, stmt in enumerate(module.body) if is_main_guard_if(stmt)]
 
 
 def is_main_guard_at_end(module: cst.Module) -> bool:

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_module_metadata_utils.py

@@ -48,7 +48,7 @@ def group_and_sort_module_metadata(module: cst.Module) -> cst.Module:
     insert_at = target_index_for_module_metadata(module)
 
     # Remove from body (reverse order) and collect nodes with cleaned leading lines
-    to_remove_indices = sorted([i for i, _, _ in found], reverse=True)
+    to_remove_indices = sorted((i for i, _, _ in found), reverse=True)
     new_body: list[cst.CSTNode] = list(module.body)
     moved: list[tuple[str, cst.SimpleStatementLine]] = []
 
@@ -92,9 +92,9 @@ def target_index_for_module_metadata(module: cst.Module) -> int:
         find_type_checking_blocks,
     )
 
-    last_type_checking = -1
-    for idx, _if in find_type_checking_blocks(module):
-        last_type_checking = max(last_type_checking, idx)
+    last_type_checking = max(
+        (idx for idx, _ in find_type_checking_blocks(module)), default=-1
+    )
 
     last_regular_import = -1
     last_future_import = -1

{wexample_filestate_python-6.8.7 → wexample_filestate_python-7.0.0}/src/wexample_filestate_python/utils/python_type_checking_utils.py

@@ -5,11 +5,11 @@ import libcst as cst
 
 def find_type_checking_blocks(module: cst.Module) -> list[tuple[int, cst.If]]:
     """Return list of (index, IfNode) for all top-level `if TYPE_CHECKING:` blocks."""
-    results: list[tuple[int, cst.If]] = []
-    for i, stmt in enumerate(module.body):
-        if isinstance(stmt, cst.If) and _is_type_checking_test(stmt.test):
-            results.append((i, stmt))
-    return results
+    return [
+        (i, stmt)
+        for i, stmt in enumerate(module.body)
+        if isinstance(stmt, cst.If) and _is_type_checking_test(stmt.test)
+    ]
 
 
 def move_type_checking_blocks_after_imports(module: cst.Module) -> cst.Module: