openrewrite-migrate-python 0.17.0.dev20261024170610__tar.gz → 0.18.0__tar.gz

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.17.0.dev20261024170610
+Version: 0.18.0
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary
@@ -19,7 +19,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: openrewrite>=8.93.11; extra == "dev"
+Requires-Dist: openrewrite>=8.94.0; extra == "dev"
 Requires-Dist: pydantic>=2.11; extra == "dev"
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "openrewrite-migrate-python"
 description = "OpenRewrite recipes for migrating Python codebases to newer Python versions."
-version = "0.17.0.dev20261024170610"  # Updated dynamically during release
+version = "0.18.0"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"
@@ -28,7 +28,7 @@ dependencies = []
 
 [project.optional-dependencies]
 dev = [
-    "openrewrite>=8.93.11",
+    "openrewrite>=8.94.0",
     # Needed so type-attribution tests can resolve `pydantic` types.
     "pydantic>=2.11",
     "pytest>=8.0.0",

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/collection_literals.py

@@ -31,6 +31,7 @@ from rewrite.python.tree import Binary as PyBinary, CollectionLiteral, Formatted
 from rewrite.java import JavaType, Space, TrailingComma
 from rewrite.java.tree import Empty, Expression, J, Literal, MethodInvocation
 from rewrite.utils import random_id
+from openrewrite_code_quality_python.codequality._trivia import has_comments
 
 # Define category path: Python > Cleanup
 _Cleanup = [*Python, CategoryDescriptor(display_name="Cleanup")]
@@ -99,7 +100,7 @@ class DictLiteral(Recipe):
                 if isinstance(self.cursor.parent_tree_cursor().value, FormattedString.Value):
                     return visited
                 match = _dict_pattern.match(visited, self.cursor)
-                if match:
+                if match and not has_comments(visited.replace(_prefix=Space.EMPTY)):
                     return _dict_template.apply(self.cursor, values=match) or visited
                 return visited
 
@@ -149,7 +150,7 @@ class ListLiteral(Recipe):
             ) -> J:
                 visited = super().visit_method_invocation(method, p)
                 match = _list_pattern.match(visited, self.cursor)
-                if match:
+                if match and not has_comments(visited.replace(_prefix=Space.EMPTY)):
                     return _list_template.apply(self.cursor, values=match) or visited
                 return visited
 
@@ -199,7 +200,7 @@ class TupleLiteral(Recipe):
             ) -> J:
                 visited = super().visit_method_invocation(method, p)
                 match = _tuple_pattern.match(visited, self.cursor)
-                if match:
+                if match and not has_comments(visited.replace(_prefix=Space.EMPTY)):
                     return _tuple_template.apply(self.cursor, values=match) or visited
                 return visited
 
@@ -365,6 +366,17 @@ class UnwrapIterableConstruction(Recipe):
                 # The argument must be a list or tuple literal
                 if not isinstance(arg, CollectionLiteral):
                     return method
+                # The literal replaces the call, so only the trivia inside the literal survives.
+                arguments = method.padding.arguments
+                padded_arg = arguments.padding.elements[0]
+                trailing_comma = padded_arg.markers.find_first(TrailingComma)
+                if any(
+                    space.comments for space in (
+                        method.name.prefix, arguments.before, arg.prefix, padded_arg.after,
+                        trailing_comma.suffix if trailing_comma else Space.EMPTY,
+                    )
+                ):
+                    return method
                 if arg.kind not in (CollectionLiteral.Kind.LIST, CollectionLiteral.Kind.TUPLE):
                     return method
                 if target_kind == CollectionLiteral.Kind.SET and all(

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/complex_transforms.py

@@ -107,9 +107,7 @@ class TernaryToIfExpression(Recipe):
                     and _is_always_truthy(match['x'])
                     and not has_comments(visited.replace(prefix=Space.EMPTY))
                 ):
-                    result = _ternary_template.apply(self.cursor, values=match)
-                    assert result is not None
-                    return result
+                    return _ternary_template.apply(self.cursor, values=match) or visited
                 return visited
 
         return Visitor()

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/comprehension_cleanup.py

@@ -32,7 +32,7 @@ from rewrite.python.preconditions import uses_method
 from rewrite.python.scope_utils import scope_of
 from rewrite.python.type_utils import is_of_class_type
 from rewrite.python.visitor import PythonVisitor
-from rewrite.python.tree import Await, ComprehensionExpression, ExpressionStatement
+from rewrite.python.tree import Await, ComprehensionExpression
 from rewrite.python.template import template, capture
 from rewrite.python.template.pattern import MatchResult
 from rewrite.java.markers import OmitParentheses, TrailingComma
@@ -516,8 +516,7 @@ class IdentityComprehension(Recipe):
                 if kind not in (ComprehensionExpression.Kind.LIST,
                                 ComprehensionExpression.Kind.SET):
                     return comp
-                # The visitor does not visit a comprehension's suffix, so has_comments misses it.
-                if has_comments(comp.replace(_prefix=Space.EMPTY)) or comp.suffix.comments:
+                if has_comments(comp.replace(_prefix=Space.EMPTY)):
                     return comp
 
                 # Must have exactly one clause with no conditions
@@ -712,7 +711,7 @@ class InvertAnyAllBody(Recipe):
                     return method
 
                 gen = _get_single_generator(method)
-                if gen is None:
+                if gen is None or has_comments(method.replace(_prefix=Space.EMPTY)):
                     return method
 
                 # Must have exactly one clause with no conditions
@@ -809,7 +808,7 @@ class ConvertAnyToIn(Recipe):
                     return method
 
                 gen = _get_single_generator(method)
-                if gen is None:
+                if gen is None or has_comments(method.replace(_prefix=Space.EMPTY)):
                     return method
 
                 # Must have exactly one clause with no conditions (no if-filter)
@@ -908,7 +907,7 @@ class SimplifyConstantSum(Recipe):
                     return method
 
                 gen = _get_single_generator(method)
-                if gen is None:
+                if gen is None or has_comments(method.replace(_prefix=Space.EMPTY)):
                     return method
 
                 # Must have exactly one clause with exactly one condition
@@ -930,14 +929,10 @@ class SimplifyConstantSum(Recipe):
                 condition = clause.conditions[0]
                 cond_expr = condition.expression
 
-                # Build bool(cond) as the new result using template.
-                # template.apply() returns an ExpressionStatement wrapper,
-                # so extract the inner expression.
                 match = MatchResult({'x': cond_expr})
-                bool_stmt = _bool_template.apply(self.cursor, values=match)
-                if not isinstance(bool_stmt, ExpressionStatement):
+                bool_call = _bool_template.apply(self.cursor, values=match)
+                if not isinstance(bool_call, MethodInvocation):
                     return method
-                bool_call = bool_stmt.expression
 
                 # Build new generator: bool(cond) for x in items (no filter)
                 new_clause = clause.replace(_conditions=[])

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/conditionals.py

@@ -20,7 +20,6 @@ from rewrite.markers import Markers
 from rewrite.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import template, capture
-from rewrite.python import ExpressionStatement
 from rewrite.python import tree as py_tree
 from rewrite.python.tree import CollectionLiteral, StatementExpression
 from rewrite.python.method_matcher import MethodMatcher
@@ -82,12 +81,14 @@ def _is_pass_only(block) -> bool:
     return len(stmts) == 1 and isinstance(stmts[0], py_tree.Pass)
 
 
-def _negate_condition(cond: Expression, cursor: Cursor) -> Expression:
+def _negate_condition(cond: Expression, cursor: Cursor) -> Expression | None:
     """``cond`` negated, where ``cursor`` points at the ``if`` it is the condition of."""
     negated = negated_without_not(cond, cancel_not=True)
     if negated is None:
-        negated = _not_template.apply(Cursor(cursor, cond), values={"c": cond})
-        assert isinstance(negated, Expression)
+        at = Cursor(cursor, cond)
+        negated = _not_template.apply(at, values={"c": cond})
+        if not isinstance(negated, Expression):
+            return None
     return negated.replace(prefix=cond.prefix)
 
 
@@ -369,6 +370,8 @@ class SwapIfElseBranches(Recipe):
                 # Negate condition
                 cond = if_stmt.if_condition.tree
                 new_cond = _negate_condition(cond, self.cursor)
+                if new_cond is None:
+                    return if_stmt
 
                 result = _set_condition(if_stmt, new_cond)
 
@@ -477,6 +480,8 @@ class RemovePassElif(Recipe):
                 # Negate the elif condition
                 elif_cond = elif_if.if_condition.tree
                 new_cond = _negate_condition(elif_cond, self.cursor)
+                if new_cond is None:
+                    return if_stmt
                 new_elif = _set_condition(elif_if, new_cond)
 
                 # Use else body as new elif body
@@ -805,9 +810,8 @@ class AssignIfExp(Recipe):
                         "other": false_val,
                     },
                 )
-                if isinstance(ternary, ExpressionStatement):
-                    ternary = ternary.expression
-                assert isinstance(ternary, Expression)
+                if not isinstance(ternary, Expression):
+                    return if_stmt
 
                 # When the if is an elif (body of an Else node), its prefix
                 # is empty — the indentation lives on the parent Else.

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/dict_cleanup.py

@@ -268,7 +268,7 @@ class SimplifyDictionaryUpdate(Recipe):
                     return method
                 if not all(
                     is_side_effect_free(e) for e in (method.select, kv.key, kv.value)
-                ) or has_comments(arg):
+                ) or has_comments(method.replace(_prefix=Space.EMPTY)):
                     return method
 
                 # Skip inside exception-testing contexts (pytest.raises,

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/expression_simplification.py

@@ -30,7 +30,6 @@ from rewrite.java.tree import (
     Ternary,
     Unary,
 )
-from rewrite.python import ExpressionStatement
 from rewrite.python.method_matcher import MethodMatcher
 from rewrite.python.preconditions import uses_method
 from rewrite.python.tree import CompilationUnit, Slice
@@ -287,10 +286,8 @@ class RemoveRedundantSliceIndex(Recipe):
                     or has_comments(array_access.replace(prefix=Space.EMPTY))
                 ):
                     return array_access
-                # start must be literal 0
-                if not isinstance(idx.start, Literal):
-                    return array_access
-                if idx.start.value != 0:
+                # Only the int `0` is the default start.
+                if not isinstance(idx.start, Literal) or type(idx.start.value) is not int or idx.start.value != 0:
                     return array_access
                 # stop must be len(same_var)
                 if idx.stop is None or not _is_len_of(idx.stop, array_access.indexed, self.cursor):
@@ -298,10 +295,7 @@ class RemoveRedundantSliceIndex(Recipe):
                 # Replace with seq[:] via template
                 result = _empty_slice_template.apply(
                     self.cursor, values={"seq": array_access.indexed}
-                )
-                if isinstance(result, ExpressionStatement):
-                    result = result.expression
-                assert result is not None
+                ) or array_access
                 return result.replace(prefix=array_access.prefix)
 
         return Preconditions.check(uses_method(_LEN), Visitor())
@@ -367,9 +361,8 @@ class SimplifyNegativeIndex(Recipe):
                     return array_access
                 # Build -k using template
                 neg_expr = _neg_template.apply(self.cursor, values={"k": k})
-                if isinstance(neg_expr, ExpressionStatement):
-                    neg_expr = neg_expr.expression
-                assert neg_expr is not None
+                if neg_expr is None:
+                    return array_access
                 neg_expr = neg_expr.replace(prefix=idx.prefix)
                 # Replace the index inside the JRightPadded wrapper
                 dim = array_access.dimension

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/logger_warn.py

@@ -1,10 +1,10 @@
 """
-Recipe for Ruff rule LOG009: undocumented-warn.
+Recipe for Ruff rule G010: logging-warn.
 
 Replaces ``logger.warn()`` with ``logger.warning()``. The ``.warn()`` method
 is an undocumented alias for ``.warning()`` that was deprecated.
 
-See: https://docs.astral.sh/ruff/rules/undocumented-warn/
+See: https://docs.astral.sh/ruff/rules/logging-warn/
 """
 
 from typing import Any, List
@@ -66,7 +66,7 @@ class ReplaceLoggerWarn(Recipe):
 
     @property
     def tags(self) -> List[str]:
-        return ["python", "cleanup", "ruff", "LOG009"]
+        return ["python", "cleanup", "ruff", "G010"]
 
     def editor(self) -> TreeVisitor[Any, ExecutionContext]:
         class Visitor(PythonVisitor[ExecutionContext]):

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/merge_startswith_endswith.py

@@ -21,7 +21,6 @@ from rewrite.decorators import categorize
 from rewrite.marketplace import Python
 from rewrite.python.method_matcher import MethodMatcher
 from rewrite.python.preconditions import uses_method
-from rewrite.python.tree import ExpressionStatement
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import template, capture
 from rewrite.java.support_types import Space
@@ -147,8 +146,6 @@ class MergeStartswithEndswith(Recipe):
                 if result is None:
                     result = self._try_merge(operands, "endswith")
                 if result is not None:
-                    if isinstance(result, ExpressionStatement):
-                        result = result.expression
                     return result.replace(prefix=binary.prefix)
                 return super().visit_binary(binary, p)
 

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/range_cleanup.py

@@ -15,8 +15,10 @@ from rewrite.python.preconditions import uses_method
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import Template, pattern, template, capture
 from rewrite.python.template.pattern import MatchResult
-from rewrite.python.tree import ExpressionStatement, Star
+from rewrite.python.tree import Star
+from rewrite.java.support_types import Space
 from rewrite.java.tree import J, MethodInvocation
+from openrewrite_code_quality_python.codequality._trivia import has_comments
 
 _Cleanup = [*Python, CategoryDescriptor(display_name="Cleanup")]
 
@@ -28,12 +30,9 @@ def _has_unpacked_argument(method: MethodInvocation) -> bool:
 
 
 def _apply(tmpl: Template, cursor: Cursor, match: MatchResult, method: MethodInvocation) -> J:
-    # `apply` returns the call wrapped in an `ExpressionStatement`, since a call is also a
-    # statement. A parse leaves a call bare in every slot.
-    result = tmpl.apply(cursor, values=match)
-    if isinstance(result, ExpressionStatement):
-        result = result.expression
-    return result or method
+    if has_comments(method.replace(_prefix=Space.EMPTY)):
+        return method
+    return tmpl.apply(cursor, values=match) or method
 
 
 # Pattern/template for range(0, x) -> range(x)

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/remove_trailing_return_none.py

@@ -50,7 +50,8 @@ _Cleanup = [*Python, CategoryDescriptor(display_name="Cleanup")]
 
 def _is_none_literal(expr) -> bool:
     """Check if an expression is the ``None`` literal."""
-    return isinstance(expr, Literal) and expr.value is None
+    # `...` is a Literal whose value is None too.
+    return isinstance(expr, Literal) and expr.value_source == "None"
 
 
 @categorize(_Cleanup)

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/string_cleanup.py

@@ -24,7 +24,7 @@ from rewrite.python.preconditions import uses_method
 from rewrite.python.type_utils import is_string
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import pattern, template, capture
-from rewrite.python.tree import ExpressionStatement, FormattedString, NamedArgument, Slice, Star
+from rewrite.python.tree import FormattedString, NamedArgument, Slice, Star
 from rewrite.java.tree import (
     ArrayAccess,
     Assignment,
@@ -413,7 +413,8 @@ class RemoveStrFromFstring(Recipe):
                 if not isinstance(visited, FormattedString.Value):
                     return visited
                 value = visited
-                if value.format is not None:
+                # A debug `{str(x)=}` prints the placeholder's source text.
+                if value.format is not None or value.debug:
                     return value
 
                 expr = value.expression
@@ -613,7 +614,8 @@ _NOT_INLINABLE = set('{}\'"\\\n\r')
 
 def _inline_literal_text(value: FormattedString.Value) -> str | None:
     """The text a constant placeholder prints as, where its source spells exactly that text."""
-    if value.conversion is not None or value.format is not None:
+    # A debug `{5=}` prints its source text before the value.
+    if value.conversion is not None or value.format is not None or value.debug:
         return None
     expr = value.expression
     if not isinstance(expr, Literal) or expr.value_source is None:
@@ -871,9 +873,6 @@ class UseStringRemoveAffix(Recipe):
 
                 values = {'t': select, 'affix': affix_lit}
                 result = _REMOVE_AFFIX_TEMPLATES[remove_method].apply(self.cursor, values=values)
-                # A parse gives an assignment statement as the bare Assignment.
-                if isinstance(result, ExpressionStatement):
-                    result = result.expression
                 return result or if_stmt
 
         return Preconditions.check(

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/use_items.py

@@ -24,7 +24,7 @@ from rewrite.python.preconditions import uses_method
 from rewrite.python.type_utils import is_of_class_type
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import template, capture
-from rewrite.python.tree import ComprehensionExpression, ExpressionStatement
+from rewrite.python.tree import ComprehensionExpression
 from rewrite.java.tree import (
     Expression,
     ForEachLoop,
@@ -138,8 +138,6 @@ class UseItemsForKeyValueIteration(Recipe):
                 result = _items_template.apply(self.cursor, values={"d": receiver})
                 if result is None:
                     return method
-                if isinstance(result, ExpressionStatement):
-                    result = result.expression
                 return result.replace(_prefix=method.prefix)
 
         return Preconditions.check(uses_method(_ZIP_PATTERN), Visitor())

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/cleanup/use_list_clear.py

@@ -23,7 +23,6 @@ from rewrite.python.type_utils import is_of_class_type
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.template import template, capture
 from rewrite.python import tree as py_tree
-from rewrite.python.tree import ExpressionStatement
 from rewrite.java.tree import ArrayAccess, Empty, J, Space
 from openrewrite_code_quality_python.codequality._trivia import has_comments
 
@@ -118,8 +117,6 @@ class UseListClear(Recipe):
                 )
                 if result is None:
                     return del_stmt
-                if isinstance(result, ExpressionStatement):
-                    result = result.expression
                 return result.replace(_prefix=del_stmt.prefix)
 
         return Visitor()

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/_semantically_equal.py

@@ -2,7 +2,9 @@
 
 from typing import List
 
+from rewrite.java.markers import TrailingComma
 from rewrite.java.support_types import J, Space
+from rewrite.markers import Marker
 from rewrite.python.template.comparator import PythonComparatorVisitor
 from rewrite.python.visitor import PythonVisitor
 from rewrite.visitor import Cursor
@@ -14,6 +16,12 @@ class _CommentTexts(PythonVisitor[List[str]]):
             p.extend(comment.text for comment in space.comments)
         return super().visit_space(space, p)
 
+    def visit_marker(self, marker: Marker, p: List[str]) -> Marker:
+        # The trivia after a trailing comma lives on its marker, not in a tree slot.
+        if isinstance(marker, TrailingComma):
+            self.visit_space(marker.suffix, p)
+        return super().visit_marker(marker, p)
+
 
 def _comment_texts(tree: J) -> List[str]:
     texts: List[str] = []

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/_trivia.py

@@ -135,31 +135,44 @@ def splice_out(
 
     The survivor takes the removed statement's place on the page: the trivia
     up to the removed statement's own line, which holds the preceding
-    statement's trailing comment, then that line's break and indent.  Only
-    comments standing on their own line before the survivor come from the
-    survivor; the removed statement's go with it.
+    statement's trailing comment, then that line's break and indent.  Comments
+    on their own lines above a removed statement may introduce what follows,
+    so they move to the survivor.  A removed statement's trailing comment goes
+    with it.
     """
     result = []
     pending: Tuple[Space, Space] | None = None
     for i, padded in enumerate(padded_statements):
+        prefix = padded.element.prefix
         if i in to_remove:
             if pending is None:
-                prefix = padded.element.prefix
                 # A file's first statement starts a line without a break to show for it.
                 pending = split_line(prefix) or (prefix, Space.EMPTY)
+            else:
+                _, tail = split_line(prefix) or (Space.EMPTY, prefix)
+                pending = (pending[0], _continue_with(pending[1], tail))
             continue
         if pending is not None:
             head, line = pending
-            prefix = padded.element.prefix
             _, tail = split_line(prefix) or (Space.EMPTY, prefix)
-            padded = padded.replace(
-                _element=padded.element.replace(
-                    _prefix=concat(
-                        head,
-                        Space(_comments=tail.comments, _whitespace=line.whitespace),
-                    )
-                )
-            )
+            padded = padded.replace(_element=padded.element.replace(_prefix=concat(head, _continue_with(line, tail))))
             pending = None
         result.append(padded)
-    return result, end if pending is None else concat(pending[0], end)
+    if pending is None:
+        return result, end
+    head, line = pending
+    return result, concat(head, _continue_with(line, end) if line.comments else end)
+
+
+def _continue_with(lines: Space, tail: Space) -> Space:
+    """``lines``, whose last whitespace indents a removed statement, continued by the ``tail`` after that statement.
+
+    Without comments in ``lines``, its leading line break stands in for the tail's.
+    """
+    if not lines.comments:
+        return Space(_comments=tail.comments, _whitespace=lines.whitespace)
+    last = lines.comments[-1]
+    return Space(
+        _comments=[*lines.comments[:-1], last.replace(_suffix=tail.whitespace), *tail.comments],
+        _whitespace=lines.whitespace,
+    )

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/_truth_value.py

@@ -6,11 +6,13 @@ from rewrite.java.tree import (
     Assert,
     Binary as JBinary,
     ControlParentheses,
+    If,
     Parentheses,
     Ternary,
     Unary,
+    WhileLoop,
 )
-from rewrite.python.tree import Binary as PyBinary
+from rewrite.python.tree import Binary as PyBinary, ComprehensionExpression
 
 _COMPARISONS = {
     JBinary.Type.Equal,
@@ -60,7 +62,7 @@ def is_chained_comparison(expr: object) -> bool:
 def is_read_as_truth_value(cursor: Cursor) -> bool:
     """Whether the value at ``cursor`` is only ever converted to ``bool``.
 
-    That holds for a condition, an ``assert`` test and a ``not`` operand.
+    That holds for a condition, a comprehension filter, an ``assert`` test and a ``not`` operand.
     An ``and``/``or`` operand counts only if the ``and``/``or`` itself does,
     because ``y = a or b`` yields ``b`` itself.
     """
@@ -71,6 +73,9 @@ def is_read_as_truth_value(cursor: Cursor) -> bool:
         parent = parent.parent_tree_cursor()
     value = parent.value
     if isinstance(value, ControlParentheses):
+        # A `match` subject and an `except` clause are held in `ControlParentheses` too.
+        return isinstance(parent.parent_tree_cursor().value, (If, WhileLoop))
+    if isinstance(value, ComprehensionExpression.Condition):
         return True
     if isinstance(value, Unary):
         return value.operator == Unary.Type.Not

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/boolean_checks_not_inverted.py

@@ -19,6 +19,7 @@ from rewrite.java.tree import J
 from rewrite.java.support_types import JavaType, JLeftPadded
 from rewrite.java.tree import (
     Binary as JBinary,
+    Expression,
     MethodDeclaration,
     Parentheses,
     Unary,
@@ -69,6 +70,24 @@ def _is_in_comparison_dunder(cursor: Cursor) -> bool:
     return method is not None and method.name.simple_name in _COMPARISON_DUNDERS
 
 
+def _drops_comments(unary: Unary, kept: Expression) -> bool:
+    """Whether the trivia between ``unary``'s operator and ``kept``'s prefix holds a comment."""
+    node: Expression = unary
+    while node is not kept:
+        if node is not unary and node.prefix.comments:
+            return True
+        if isinstance(node, Unary):
+            if node.padding.operator.before.comments:
+                return True
+            node = node.expression
+        elif isinstance(node, Parentheses):
+            if node.padding.tree.after.comments:
+                return True
+            node = node.tree
+        else:
+            return True
+    return bool(kept.prefix.comments)
+
 
 @categorize(_CodeQuality)
 class BooleanChecksNotInverted(Recipe):
@@ -143,6 +162,7 @@ class BooleanChecksNotInverted(Recipe):
                     isinstance(inner, Unary)
                     and inner.operator == Unary.Type.Not
                     and is_read_as_truth_value(self.cursor)
+                    and not _drops_comments(unary, inner.expression)
                 ):
                     return inner.expression.replace(_prefix=unary.prefix)
 
@@ -151,6 +171,7 @@ class BooleanChecksNotInverted(Recipe):
                     isinstance(inner, JBinary)
                     and _is_invertible(inner)
                     and not _is_in_comparison_dunder(self.cursor)
+                    and not _drops_comments(unary, inner)
                 ):
                     inverse = _OPERATOR_INVERSE.get(inner.operator)
                     if inverse is not None:

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/collapsible_if_statements.py

@@ -78,7 +78,7 @@ class CollapsibleIfStatements(Recipe):
 
     @property
     def display_name(self) -> str:
-        return "Merge collapsible if statements"
+        return "Merge collapsible `if` statements"
 
     @property
     def description(self) -> str:

{openrewrite_migrate_python-0.17.0.dev20261024170610 → openrewrite_migrate_python-0.18.0}/src/openrewrite_code_quality_python/codequality/remove_duplicate_conditions.py

@@ -75,7 +75,7 @@ class RemoveDuplicateConditions(Recipe):
 
     @property
     def display_name(self) -> str:
-        return "Remove duplicate conditions in if/elif chains"
+        return "Remove duplicate conditions in `if`/`elif` chains"
 
     @property
     def description(self) -> str:
@@ -153,7 +153,11 @@ def _prune_chain(root: If, current: If, seen: list[Expression]) -> If:
             return _prune_chain(root, updated_current, seen)
         return root
     else:
-        seen.append(cond)
+        if is_side_effect_free(cond):
+            seen.append(cond)
+        else:
+            # A condition that may run code or bind a name can change what an earlier one reads.
+            seen.clear()
         return _prune_chain(root, branch, seen)