openrewrite-migrate-python 0.14.0.dev20260903170551__tar.gz → 0.14.0.dev20260903174925__tar.gz

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260903170551
+Version: 0.14.0.dev20260903174925
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/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.14.0.dev20260903170551"  # Updated dynamically during release
+version = "0.14.0.dev20260903174925"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"

openrewrite_migrate_python-0.14.0.dev20260903174925/src/openrewrite_migrate_python/migrate/_slots.py

@@ -0,0 +1,14 @@
+"""Keeping a replacement node in the slot kind its original occupied."""
+
+from rewrite import Cursor
+from rewrite.java.tree import Block, Expression, J
+from rewrite.python.tree import CompilationUnit, ExpressionStatement
+from rewrite.utils import random_id
+
+
+def as_slot_of(cursor: Cursor, expression: Expression) -> J:
+    """Wrap ``expression`` as an ``ExpressionStatement`` when the tree at
+    ``cursor`` is its own statement, so the replacement stays a Statement."""
+    if isinstance(cursor.parent_tree_cursor().value, (Block, CompilationUnit)):
+        return ExpressionStatement(random_id(), expression)
+    return expression

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/src/openrewrite_migrate_python/migrate/asyncio_coroutine_to_async.py

@@ -27,11 +27,13 @@ from rewrite.marketplace import Python
 from rewrite.python.preconditions import uses_import
 from rewrite.markers import Markers
 from rewrite.python.visitor import PythonVisitor
-from rewrite.python.tree import Await, YieldFrom
+from rewrite.python.tree import Await, StatementExpression, YieldFrom
 from rewrite.java.tree import (
     Annotation,
     FieldAccess,
     Identifier,
+    J,
+    Lambda,
     MethodDeclaration,
     Modifier,
     Space,
@@ -39,6 +41,8 @@ from rewrite.java.tree import (
 )
 from rewrite.utils import random_id
 
+from ._slots import as_slot_of
+
 # Define category path: Python > Migrate > Python 3.11
 _Python311 = [
     *Python,
@@ -127,33 +131,41 @@ def _add_async_modifier(method: MethodDeclaration, has_remaining_decorators: boo
 
 
 class _YieldFromToAwaitVisitor(PythonVisitor[ExecutionContext]):
-    """Visitor that transforms yield from expressions to await expressions.
-
-    In Python's AST, 'yield from expr' is represented as:
-        J.Yield(value=Py.YieldFrom(expression=expr))
+    """Replaces ``yield from expr`` with ``await expr``.
 
-    We need to replace the entire Yield with just Await(expression).
+    The parser represents ``yield from expr`` as
+    ``StatementExpression(Yield(YieldFrom(expr)))`` whether it is used as an
+    expression or as its own statement, so the wrapper is the node to replace.
     """
 
-    def visit_yield(
-        self, yield_stmt: Yield, p: ExecutionContext
-    ) -> Optional[Any]:
-        yield_stmt = super().visit_yield(yield_stmt, p)
-
-        # Check if this is a 'yield from' (Yield containing YieldFrom)
-        if isinstance(yield_stmt.value, YieldFrom):
-            yield_from = yield_stmt.value
-            # Transform yield from expr -> await expr
-            # The Await takes the Yield's prefix (space before 'yield')
-            return Await(
-                _id=random_id(),
-                _prefix=yield_stmt.prefix,
-                _markers=yield_stmt.markers,
-                _expression=yield_from.expression,
-                _type=yield_from.type,
-            )
-
-        return yield_stmt
+    def visit_statement_expression(
+        self, stmt_expr: StatementExpression, p: ExecutionContext
+    ) -> Optional[J]:
+        stmt_expr = super().visit_statement_expression(stmt_expr, p)
+        if not isinstance(stmt_expr, StatementExpression):
+            return stmt_expr
+
+        yield_stmt = stmt_expr.statement
+        if not isinstance(yield_stmt, Yield) or not isinstance(yield_stmt.value, YieldFrom):
+            return stmt_expr
+
+        yield_from = yield_stmt.value
+        await_ = Await(
+            _id=random_id(),
+            _prefix=yield_stmt.prefix,
+            _markers=yield_stmt.markers,
+            _expression=yield_from.expression,
+            _type=yield_from.type,
+        )
+        return as_slot_of(self.cursor, await_)
+
+    # Started on the migrated function's body block, so any def or lambda met
+    # here is a nested function whose ``yield from`` must stay.
+    def visit_method_declaration(self, method: MethodDeclaration, p: ExecutionContext) -> J:
+        return method
+
+    def visit_lambda(self, lambda_: Lambda, p: ExecutionContext) -> J:
+        return lambda_
 
 
 @categorize(_Python311)

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/src/openrewrite_migrate_python/migrate/string_formatting.py

@@ -31,6 +31,8 @@ from rewrite.python.tree import (
 )
 from rewrite.utils import random_id
 
+from ._slots import as_slot_of
+
 # Define category path: Python > Migrate > Python 3.6
 _Python36 = [
     *Python,
@@ -354,7 +356,7 @@ class ReplaceStrFormatWithFString(Recipe):
         class Visitor(PythonVisitor[ExecutionContext]):
             def visit_method_invocation(
                 self, method: MethodInvocation, p: ExecutionContext
-            ) -> Optional[Expression]:
+            ) -> Optional[J]:
                 method = super().visit_method_invocation(method, p)
 
                 if not isinstance(method, MethodInvocation):
@@ -373,7 +375,7 @@ class ReplaceStrFormatWithFString(Recipe):
 
                 result = _convert_format_to_fstring(method)
                 if result is not None:
-                    return result
+                    return as_slot_of(self.cursor, result)
 
                 return method
 

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260903170551
+Version: 0.14.0.dev20260903174925
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/src/openrewrite_migrate_python.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/openrewrite_migrate_python/migrate/_from_imports.py
 src/openrewrite_migrate_python/migrate/_import_hygiene.py
 src/openrewrite_migrate_python/migrate/_langchain_tables.py
 src/openrewrite_migrate_python/migrate/_markers.py
+src/openrewrite_migrate_python/migrate/_slots.py
 src/openrewrite_migrate_python/migrate/_typing_imports.py
 src/openrewrite_migrate_python/migrate/aifc_migrations.py
 src/openrewrite_migrate_python/migrate/array_deprecations.py

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/tests/test_asyncio_coroutine_to_async.py

@@ -4,10 +4,35 @@ from rewrite.test import RecipeSpec, python
 from openrewrite_migrate_python.migrate.asyncio_coroutine_to_async import (
     MigrateAsyncioCoroutine,
 )
+from tests.tree_checks import assert_statement_slots_hold_statements
 
 class TestMigrateAsyncioCoroutine:
     """Tests for the MigrateAsyncioCoroutine recipe."""
 
+    def test_await_lands_in_the_slot_its_yield_from_occupied(self):
+        """A statement-level `yield from` becomes an `await` statement; an expression-level one a bare `await`."""
+        spec = RecipeSpec(recipe=MigrateAsyncioCoroutine())
+        spec.rewrite_run(
+            python(
+                """
+                import asyncio
+
+                @asyncio.coroutine
+                def run():
+                    yield from step()
+                    result = yield from step()
+                """,
+                """
+                import asyncio
+
+                async def run():
+                    await step()
+                    result = await step()
+                """,
+                after_recipe=assert_statement_slots_hold_statements,
+            )
+        )
+
     def test_migrates_simple_coroutine(self):
         """Test migration of a simple @asyncio.coroutine function."""
         spec = RecipeSpec(recipe=MigrateAsyncioCoroutine())
@@ -130,3 +155,30 @@ class TestMigrateAsyncioCoroutine:
                 """,
             )
         )
+
+    def test_leaves_yield_from_in_nested_def_alone(self):
+        """A nested def or lambda keeps its yield from; await is a SyntaxError there."""
+        spec = RecipeSpec(recipe=MigrateAsyncioCoroutine())
+        spec.rewrite_run(
+            python(
+                """
+                import asyncio
+
+                @asyncio.coroutine
+                def outer():
+                    def gen():
+                        yield from range(3)
+                    g = lambda: (yield from range(3))
+                    yield from step()
+                """,
+                """
+                import asyncio
+
+                async def outer():
+                    def gen():
+                        yield from range(3)
+                    g = lambda: (yield from range(3))
+                    await step()
+                """,
+            )
+        )

{openrewrite_migrate_python-0.14.0.dev20260903170551 → openrewrite_migrate_python-0.14.0.dev20260903174925}/tests/test_string_formatting.py

@@ -6,6 +6,7 @@ from openrewrite_migrate_python.migrate.string_formatting import (
     ReplacePercentFormatWithFString,
     ReplaceStrFormatWithFString,
 )
+from tests.tree_checks import assert_statement_slots_hold_statements
 
 def _assert_idempotent(recipe: Recipe):
     """Return an after_recipe callback that asserts running the recipe again produces no change."""
@@ -25,6 +26,25 @@ def _assert_idempotent(recipe: Recipe):
 class TestReplaceStrFormatWithFString:
     """Tests for the ReplaceStrFormatWithFString recipe."""
 
+    def test_bare_format_call_statement_stays_a_statement(self):
+        """'{}'.format(x) as its own statement → an f-string statement, not a bare f-string"""
+        spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())
+        spec.rewrite_run(
+            python(
+                """
+                "{}".format(x)
+                def f():
+                    "{}".format(y)
+                """,
+                """
+                f"{x}"
+                def f():
+                    f"{y}"
+                """,
+                after_recipe=assert_statement_slots_hold_statements,
+            )
+        )
+
     def test_simple_auto_numbered(self):
         """'Hello {}'.format(name) → f'Hello {name}'"""
         spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())