openrewrite-migrate-python 0.16.0.dev20261007190022__tar.gz → 0.16.0.dev20261008024228__tar.gz

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.16.0.dev20261007190022
+Version: 0.16.0.dev20261008024228
 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.92.3; extra == "dev"
+Requires-Dist: openrewrite>=8.92.18; 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.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/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.16.0.dev20261007190022"  # Updated dynamically during release
+version = "0.16.0.dev20261008024228"  # 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.92.3",
+    "openrewrite>=8.92.18",
     # Needed so type-attribution tests can resolve `pydantic` types.
     "pydantic>=2.11",
     "pytest>=8.0.0",

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/_reindent.py

@@ -4,14 +4,15 @@ Python indentation lives in the ``Space`` before each token, so moving a block
 to a shallower nesting level means rewriting every line it spans.
 """
 
-from typing import Optional, TypeVar
+from typing import Optional, TypeVar, cast
 
 from rewrite.java.markers import TrailingComma
 from rewrite.java.support_types import Space
+from rewrite.java.tree import J
 from rewrite.markers import Marker
 from rewrite.python.visitor import PythonVisitor
 
-T = TypeVar("T")
+T = TypeVar("T", bound=J)
 
 
 def inherited_prefix(dropped: Space, body: Space) -> Space:
@@ -90,4 +91,4 @@ def reindent(tree: T, old_base: str, new_base: str) -> T:
     """
     if old_base == new_base:
         return tree
-    return _Reindent(old_base, new_base).visit(tree, None)
+    return cast(T, _Reindent(old_base, new_base).visit(tree, None))

openrewrite_migrate_python-0.16.0.dev20261008024228/src/openrewrite_code_quality_python/codequality/_semantically_equal.py

@@ -0,0 +1,38 @@
+"""Semantic equality of LST nodes, for recipes that keep one of two equal subtrees."""
+
+from typing import List, Optional
+
+from rewrite.java.support_types import J, Space
+from rewrite.python.template.comparator import PythonComparatorVisitor
+from rewrite.python.visitor import PythonVisitor
+from rewrite.visitor import Cursor
+
+
+class _CommentTexts(PythonVisitor[List[str]]):
+    def visit_space(self, space: Optional[Space], p: List[str]) -> Space:
+        if space is not None:
+            p.extend(comment.text for comment in space.comments)
+        return super().visit_space(space, p)
+
+
+def _comment_texts(tree: J) -> List[str]:
+    texts: List[str] = []
+    _CommentTexts().visit(tree, texts)
+    return texts
+
+
+class SemanticallyEqual:
+    """Compare two LST nodes for structural equality."""
+
+    @staticmethod
+    def are_equal(a: Optional[J], b: Optional[J]) -> bool:
+        """Whether *a* and *b* are the same code carrying the same comments.
+
+        Whitespace is ignored. Comments must match, so a recipe dropping either copy loses none.
+        """
+        if a is None or b is None:
+            return a is b
+        return (
+            PythonComparatorVisitor().compare(a, b, Cursor(None, Cursor.ROOT_VALUE))
+            and _comment_texts(a) == _comment_texts(b)
+        )

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/_trivia.py

@@ -12,7 +12,7 @@ from typing import Optional, Tuple
 
 from rewrite import Cursor
 from rewrite.java.support_types import Space
-from rewrite.java.tree import Block, ClassDeclaration, If, MethodDeclaration
+from rewrite.java.tree import Block, ClassDeclaration, If, J, MethodDeclaration
 from rewrite.python.tree import CompilationUnit
 
 
@@ -81,9 +81,11 @@ def space_after_block(cursor: Cursor) -> Optional[Space]:
     know how to look past.
     """
     child = cursor.value
+    if not isinstance(child, J):
+        return None
     for parent in islice(cursor.get_path(), 1, None):
         if isinstance(parent, (Block, CompilationUnit)):
-            statements = parent._statements
+            statements = parent.padding.statements
             index = next(
                 (i for i, s in enumerate(statements) if s.element.id == child.id),
                 None,
@@ -125,7 +127,8 @@ def splice_out(
             continue
         if pending is not None:
             head, line = pending
-            _, tail = split_line(padded.element.prefix)
+            prefix = padded.element.prefix
+            _, tail = split_line(prefix) or (Space.EMPTY, prefix)
             padded = padded.replace(
                 _element=padded.element.replace(
                     _prefix=concat(

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/all_branches_identical.py

@@ -15,7 +15,9 @@ from rewrite import ExecutionContext, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
+from rewrite.python.tree import CompilationUnit
 from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import J
 from rewrite.java.tree import (
     Block,
     If,
@@ -144,19 +146,23 @@ class AllBranchesIdentical(Recipe):
     def editor(self) -> TreeVisitor[Any, ExecutionContext]:
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_compilation_unit(self, cu, p):
-                cu = super().visit_compilation_unit(cu, p)
-                new_stmts = _replace_identical_ifs_padded(cu._statements)
+                visited = super().visit_compilation_unit(cu, p)
+                if not isinstance(visited, CompilationUnit):
+                    return visited
+                cu = visited
+                new_stmts = _replace_identical_ifs_padded(cu.padding.statements)
                 if new_stmts is not None:
                     return cu.replace(_statements=new_stmts)
                 return cu
 
             def visit_block(
                 self, block: Block, p: ExecutionContext
-            ) -> Optional[Block]:
-                block = super().visit_block(block, p)
-                if not isinstance(block, Block):
-                    return block
-                new_stmts = _replace_identical_ifs_padded(block._statements)
+            ) -> J:
+                visited = super().visit_block(block, p)
+                if not isinstance(visited, Block):
+                    return visited
+                block = visited
+                new_stmts = _replace_identical_ifs_padded(block.padding.statements)
                 if new_stmts is not None:
                     return block.replace(_statements=new_stmts)
                 return block
@@ -186,12 +192,12 @@ def _replace_identical_ifs_padded(padded_stmts) -> Optional[list]:
             continue
 
         body = s.then_part
-        if not isinstance(body, Block) or not body._statements:
+        if not isinstance(body, Block) or not body.padding.statements:
             result.append(rp)
             continue
 
         if_indent = line_indent(s.prefix)
-        body_indent = line_indent(body._statements[0].element.prefix)
+        body_indent = line_indent(body.padding.statements[0].element.prefix)
         if (
             if_indent is None
             or body_indent is None
@@ -201,7 +207,7 @@ def _replace_identical_ifs_padded(padded_stmts) -> Optional[list]:
             continue
 
         body = reindent(body, body_indent, if_indent)
-        first = body._statements[0]
+        first = body.padding.statements[0]
         # Each lifted statement keeps its own padding, which is where a `;`
         # separating it from the next one is recorded.
         result.append(
@@ -211,7 +217,7 @@ def _replace_identical_ifs_padded(padded_stmts) -> Optional[list]:
                 )
             )
         )
-        result.extend(body._statements[1:])
+        result.extend(body.padding.statements[1:])
         changed = True
 
     if not changed:

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/boolean_checks_not_inverted.py

@@ -8,7 +8,7 @@ when written as ``a != b``, and ``not (not x)`` is just ``x``.
 See: https://rules.sonarsource.com/python/RSPEC-S1940/
 """
 
-from typing import Any, List, Optional
+from typing import Any, List
 
 from rewrite import Cursor, ExecutionContext, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
@@ -16,6 +16,7 @@ from rewrite.decorators import categorize
 from rewrite.marketplace import Python
 from rewrite.python.tree import Binary as PyBinary
 from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import J
 from rewrite.java.support_types import JavaType, JLeftPadded
 from rewrite.java.tree import (
     Assert,
@@ -146,11 +147,11 @@ class BooleanChecksNotInverted(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_unary(
                 self, unary: Unary, p: ExecutionContext
-            ) -> Optional[Expression]:
-                unary = super().visit_unary(unary, p)
-
-                if not isinstance(unary, Unary):
-                    return unary
+            ) -> J:
+                visited = super().visit_unary(unary, p)
+                if not isinstance(visited, Unary):
+                    return visited
+                unary = visited
 
                 if unary.operator != Unary.Type.Not:
                     return unary

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/collapsible_if_statements.py

@@ -9,27 +9,22 @@ easier to follow.
 See: https://rules.sonarsource.com/python/RSPEC-S1066/
 """
 
-from typing import Any, List, Optional
+from typing import Any, List
 
 from rewrite import ExecutionContext, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
 from rewrite.markers import Markers
-from rewrite.python.tree import StatementExpression
+from rewrite.python.template.precedence import maybe_parenthesize
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java.support_types import Comment, JLeftPadded, JRightPadded, Space
 from rewrite.java.tree import (
-    Assignment,
     Binary as JBinary,
     Block,
     ControlParentheses,
-    Expression,
     If,
     J,
-    Lambda,
-    Parentheses,
-    Ternary,
 )
 from rewrite.utils import random_id
 
@@ -48,18 +43,6 @@ _CodeQuality = [
 ]
 
 
-def _binds_looser_than_and(expr: Expression) -> bool:
-    """Return True for the operand forms that ``and`` would capture.
-
-    Everything below ``and`` in Python's precedence table: ``or``, the
-    conditional expression, ``lambda``, ``:=`` (a ``J.Assignment`` here) and
-    ``yield`` (a ``Py.StatementExpression``).
-    """
-    if isinstance(expr, JBinary):
-        return expr.operator == JBinary.Type.Or
-    return isinstance(expr, (Ternary, Lambda, Assignment, StatementExpression))
-
-
 def _with_comments_above(prefix: Space, comments: List[Comment]) -> Space:
     """*prefix* with *comments* on their own lines just before the token it
     leads into. Each comment's suffix must already end at that token's indent."""
@@ -68,23 +51,6 @@ def _with_comments_above(prefix: Space, comments: List[Comment]) -> Space:
     return Space(_comments=[*prefix.comments, *comments], _whitespace=prefix.whitespace)
 
 
-def _operand(expr: Expression, prefix: Space) -> Expression:
-    """Prepare *expr* as an operand of the merged ``and``, parenthesizing it
-    when its own operator would otherwise be captured."""
-    if _binds_looser_than_and(expr):
-        return Parentheses(
-            _id=random_id(),
-            _prefix=prefix,
-            _markers=Markers.EMPTY,
-            _tree=JRightPadded(
-                _element=expr.replace(_prefix=Space.EMPTY),
-                _after=Space.EMPTY,
-                _markers=Markers.EMPTY,
-            ),
-        )
-    return expr.replace(_prefix=prefix)
-
-
 @categorize(_CodeQuality)
 class CollapsibleIfStatements(Recipe):
     """
@@ -140,11 +106,11 @@ class CollapsibleIfStatements(Recipe):
 
             def visit_if(
                 self, if_: If, p: ExecutionContext
-            ) -> Optional[If]:
-                if_ = super().visit_if(if_, p)
-
-                if not isinstance(if_, If):
-                    return if_
+            ) -> J:
+                visited = super().visit_if(if_, p)
+                if not isinstance(visited, If):
+                    return visited
+                if_ = visited
 
                 # Outer if must have no else/elif
                 if if_.else_part is not None:
@@ -212,18 +178,21 @@ class CollapsibleIfStatements(Recipe):
                     _id=random_id(),
                     _prefix=if_.if_condition.tree.prefix,
                     _markers=Markers.EMPTY,
-                    _left=_operand(if_.if_condition.tree, Space.EMPTY),
+                    _left=if_.if_condition.tree.replace(_prefix=Space.EMPTY),
                     _operator=JLeftPadded(
                         _before=Space.SINGLE_SPACE,
                         _element=JBinary.Type.And,
                         _markers=Markers.EMPTY,
                     ),
-                    _right=_operand(
-                        reindent(inner.if_condition.tree, header_indent, outer_indent),
-                        Space.SINGLE_SPACE,
+                    _right=reindent(inner.if_condition.tree, header_indent, outer_indent).replace(
+                        _prefix=Space.SINGLE_SPACE
                     ),
                     _type=None,
                 )
+                combined = combined.replace(
+                    _left=maybe_parenthesize(combined, combined.left.id, combined.left),
+                    _right=maybe_parenthesize(combined, combined.right.id, combined.right),
+                )
 
                 new_condition = ControlParentheses(
                     _id=if_.if_condition.id,
@@ -240,7 +209,7 @@ class CollapsibleIfStatements(Recipe):
                 # level at a time, and each pass rebases the comments the
                 # previous one left at the level it dropped.
                 inner_body = reindent(inner_body, body_indent, header_indent)
-                first = inner_body._statements[0]
+                first = inner_body.padding.statements[0]
                 inner_body = inner_body.replace(
                     _statements=[
                         first.replace(
@@ -248,7 +217,7 @@ class CollapsibleIfStatements(Recipe):
                                 _prefix=concat(header_trailer, first.element.prefix)
                             )
                         ),
-                        *inner_body._statements[1:],
+                        *inner_body.padding.statements[1:],
                     ]
                 )
 

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/find_suspicious_chained_comparison.py

@@ -14,10 +14,10 @@ from rewrite import ExecutionContext, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
-from rewrite.markers import Markers, SearchResult
+from rewrite.markers import SearchResult
 from rewrite.python.visitor import PythonVisitor
-from rewrite.java.tree import Binary as JBinary, Expression
-from rewrite.utils import random_id
+from rewrite.java.tree import J
+from rewrite.java.tree import Binary as JBinary
 
 _CodeQuality = [
     *Python,
@@ -37,18 +37,11 @@ def _direction(operator: JBinary.Type) -> Optional[str]:
     return None
 
 
-def _mark(tree: Expression) -> Expression:
-    """Attach a SearchResult flagging the conflicting chained comparison."""
-    message = (
-        "Suspicious chained comparison: the two comparisons point in "
-        "opposite directions, so the chain narrows to a surprising range. "
-        "Did you mean to keep both comparisons in the same direction?"
-    )
-    marker = SearchResult(random_id(), message)
-    current = tree.markers
-    return tree.replace(
-        _markers=Markers(current.id, list(current.markers) + [marker])
-    )
+_MESSAGE = (
+    "Suspicious chained comparison: the two comparisons point in "
+    "opposite directions, so the chain narrows to a surprising range. "
+    "Did you mean to keep both comparisons in the same direction?"
+)
 
 
 @categorize(_CodeQuality)
@@ -99,11 +92,11 @@ class FindSuspiciousChainedComparison(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_binary(
                 self, binary: JBinary, p: ExecutionContext
-            ) -> Optional[Expression]:
-                binary = super().visit_binary(binary, p)
-
-                if not isinstance(binary, JBinary):
-                    return binary
+            ) -> J:
+                visited = super().visit_binary(binary, p)
+                if not isinstance(visited, JBinary):
+                    return visited
+                binary = visited
 
                 outer = _direction(binary.operator)
                 if outer is None:
@@ -117,6 +110,6 @@ class FindSuspiciousChainedComparison(Recipe):
                 if left is None or left == outer:
                     return binary
 
-                return _mark(binary)
+                return SearchResult.found(binary, _MESSAGE)
 
         return Visitor()

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/merge_identical_branches.py

@@ -9,26 +9,23 @@ multiple conditions.
 See: https://rules.sonarsource.com/python/RSPEC-S1871/
 """
 
-from typing import Any, List, Optional
+from typing import Any, List
 
 from rewrite import ExecutionContext, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
 from rewrite.markers import Markers
+from rewrite.python.template.precedence import maybe_parenthesize, parenthesize
 from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import J
 from rewrite.java.support_types import JLeftPadded, JRightPadded, Space
 from rewrite.java.tree import (
-    Assignment,
     Binary as JBinary,
-    Block,
     ControlParentheses,
     Expression,
     If,
-    Lambda,
-    Parentheses,
     Statement,
-    Ternary,
 )
 from openrewrite_code_quality_python.codequality._semantically_equal import SemanticallyEqual
 from rewrite.utils import random_id
@@ -39,12 +36,12 @@ _CodeQuality = [
 ]
 
 
-def _needs_parens_as_or_operand(expr: Expression) -> bool:
-    # A walrus, ternary or lambda binds looser than `or`. An `and` does not,
-    # and is parenthesized for readability.
-    if isinstance(expr, (Assignment, Ternary, Lambda)):
-        return True
-    return isinstance(expr, JBinary) and expr.operator == JBinary.Type.And
+def _or_operand(expr: Expression, prefix: Space) -> Expression:
+    # An `and` binds tighter than `or` and is parenthesized for readability.
+    expr = expr.replace(_prefix=prefix)
+    if isinstance(expr, JBinary) and expr.operator == JBinary.Type.And:
+        return parenthesize(expr)
+    return expr
 
 
 def _bodies_equal(a: Statement, b: Statement) -> bool:
@@ -106,11 +103,11 @@ class MergeIdenticalBranches(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_if(
                 self, if_: If, p: ExecutionContext
-            ) -> Optional[If]:
-                if_ = super().visit_if(if_, p)
-
-                if not isinstance(if_, If):
-                    return if_
+            ) -> J:
+                visited = super().visit_if(if_, p)
+                if not isinstance(visited, If):
+                    return visited
+                if_ = visited
 
                 # Only process top-level if in a chain
                 try:
@@ -166,47 +163,23 @@ def _merge_conditions(first: If, second: If) -> If:
     first_cond = first.if_condition.tree
     second_cond = second.if_condition.tree
 
-    if _needs_parens_as_or_operand(first_cond):
-        left = Parentheses(
-            _id=random_id(),
-            _prefix=first_cond.prefix,
-            _markers=Markers.EMPTY,
-            _tree=JRightPadded(
-                _element=first_cond.replace(_prefix=Space.EMPTY),
-                _after=Space.EMPTY,
-                _markers=Markers.EMPTY,
-            ),
-        )
-    else:
-        left = first_cond
-
-    if _needs_parens_as_or_operand(second_cond):
-        right = Parentheses(
-            _id=random_id(),
-            _prefix=Space.SINGLE_SPACE,
-            _markers=Markers.EMPTY,
-            _tree=JRightPadded(
-                _element=second_cond.replace(_prefix=Space.EMPTY),
-                _after=Space.EMPTY,
-                _markers=Markers.EMPTY,
-            ),
-        )
-    else:
-        right = second_cond.replace(_prefix=Space.SINGLE_SPACE)
-
     combined = JBinary(
         _id=random_id(),
-        _prefix=left.prefix,
+        _prefix=first_cond.prefix,
         _markers=Markers.EMPTY,
-        _left=left.replace(_prefix=Space.EMPTY),
+        _left=_or_operand(first_cond, Space.EMPTY),
         _operator=JLeftPadded(
             _before=Space.SINGLE_SPACE,
             _element=JBinary.Type.Or,
             _markers=Markers.EMPTY,
         ),
-        _right=right,
+        _right=_or_operand(second_cond, Space.SINGLE_SPACE),
         _type=None,
     )
+    combined = combined.replace(
+        _left=maybe_parenthesize(combined, combined.left.id, combined.left),
+        _right=maybe_parenthesize(combined, combined.right.id, combined.right),
+    )
 
     new_condition = ControlParentheses(
         _id=first.if_condition.id,

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/remove_duplicate_conditions.py

@@ -16,6 +16,7 @@ from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
 from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import J
 from rewrite.java.tree import If, Expression
 from openrewrite_code_quality_python.codequality._semantically_equal import SemanticallyEqual
 from openrewrite_code_quality_python.codequality._side_effects import is_side_effect_free
@@ -97,11 +98,11 @@ class RemoveDuplicateConditions(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_if(
                 self, if_: If, p: ExecutionContext
-            ) -> Optional[If]:
-                if_ = super().visit_if(if_, p)
-
-                if not isinstance(if_, If):
-                    return if_
+            ) -> J:
+                visited = super().visit_if(if_, p)
+                if not isinstance(visited, If):
+                    return visited
+                if_ = visited
 
                 # Only process top-level if (not elif branches visited
                 # as children -- those are handled by walking the chain)

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/remove_self_assignment.py

@@ -19,6 +19,7 @@ from rewrite.marketplace import Python
 from rewrite.java.support_types import Space
 from rewrite.python.tree import CompilationUnit
 from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import J
 from rewrite.java.tree import (
     Assignment,
     Block,
@@ -158,12 +159,15 @@ class RemoveSelfAssignment(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_block(
                 self, block: Block, p: ExecutionContext
-            ) -> Optional[Block]:
-                block = super().visit_block(block, p)
-                if not isinstance(block, Block) or not _in_function_scope(self.cursor):
+            ) -> J:
+                visited = super().visit_block(block, p)
+                if not isinstance(visited, Block):
+                    return visited
+                block = visited
+                if not _in_function_scope(self.cursor):
                     return block
                 removed = _remove_self_assignments(
-                    block._statements, block.end, space_after_block(self.cursor)
+                    block.padding.statements, block.end, space_after_block(self.cursor)
                 )
                 if removed is not None:
                     return block.replace(_statements=removed[0], _end=removed[1])

{openrewrite_migrate_python-0.16.0.dev20261007190022 → openrewrite_migrate_python-0.16.0.dev20261008024228}/src/openrewrite_code_quality_python/codequality/remove_unconditional_value_overwrite.py

@@ -289,14 +289,15 @@ class RemoveUnconditionalValueOverwrite(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_block(
                 self, block: Block, p: ExecutionContext
-            ) -> Optional[Block]:
-                block = super().visit_block(block, p)
-                if not isinstance(block, Block):
-                    return block
+            ) -> J:
+                visited = super().visit_block(block, p)
+                if not isinstance(visited, Block):
+                    return visited
+                block = visited
                 function = _enclosing_function(self.cursor)
                 if function is None:
                     return block
-                removed = _remove_overwrites(block._statements, block.end, function)
+                removed = _remove_overwrites(block.padding.statements, block.end, function)
                 if removed is not None:
                     return block.replace(_statements=removed[0], _end=removed[1])
                 return block