openrewrite-migrate-python 0.17.0.dev20261015170646__tar.gz → 0.17.0.dev20261016170653__tar.gz

{openrewrite_migrate_python-0.17.0.dev20261015170646 → openrewrite_migrate_python-0.17.0.dev20261016170653}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.17.0.dev20261015170646
+Version: 0.17.0.dev20261016170653
 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.17.0.dev20261015170646 → openrewrite_migrate_python-0.17.0.dev20261016170653}/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.dev20261015170646"  # Updated dynamically during release
+version = "0.17.0.dev20261016170653"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"

{openrewrite_migrate_python-0.17.0.dev20261015170646 → openrewrite_migrate_python-0.17.0.dev20261016170653}/src/openrewrite_migrate_python/migrate/typing_union_to_pipe.py

@@ -10,7 +10,7 @@ PEP 604 (Python 3.10+) introduced the `X | Y` syntax for union types:
 See: https://peps.python.org/pep-0604/
 """
 
-from typing import Any, List, Optional, Sequence, Set
+from typing import Any, List, Sequence, Set
 
 from rewrite import Cursor, ExecutionContext, Preconditions, Recipe, TreeVisitor
 from rewrite.category import CategoryDescriptor
@@ -105,13 +105,11 @@ def _create_none_literal(prefix: Space) -> Literal:
     )
 
 
-def _create_union_type(
-    types: List[Expression], prefix: Space, type_: Optional[JavaType]
-) -> UnionType:
-    """Create a UnionType node (X | Y | Z).
+def _create_union_type(types: List[Expression], replaced: Expression) -> UnionType:
+    """A UnionType (X | Y | Z) in place of the subscript `replaced`.
 
-    The UnionType node represents the PEP 604 union syntax.
-    Each type in the list is separated by ' | '.
+    It takes over the subscript's prefix, type and markers, so a `Quoted`
+    subscript keeps its quotes.
     """
     # Create JRightPadded list with ' | ' after each type except the last
     padded_types = []
@@ -137,10 +135,10 @@ def _create_union_type(
 
     return UnionType(
         _id=random_id(),
-        _prefix=prefix,
-        _markers=Markers.EMPTY,
+        _prefix=replaced.prefix,
+        _markers=replaced.markers,
         _types=padded_types,
-        _type=type_,
+        _type=replaced.type,
     )
 
 
@@ -211,7 +209,7 @@ class ReplaceTypingOptionalWithUnion(Recipe):
 
                 # Create X | None using UnionType
                 none_literal = _create_none_literal(Space.EMPTY)
-                return _create_union_type([type_arg, none_literal], param_type.prefix, param_type.type)
+                return _create_union_type([type_arg, none_literal], param_type)
 
             def visit_array_access(
                 self, array_access: ArrayAccess, p: ExecutionContext
@@ -238,7 +236,7 @@ class ReplaceTypingOptionalWithUnion(Recipe):
 
                 # Create X | None using UnionType
                 none_literal = _create_none_literal(Space.EMPTY)
-                return _create_union_type([index, none_literal], array_access.prefix, array_access.type)
+                return _create_union_type([index, none_literal], array_access)
 
         return Preconditions.check(uses_import("typing"), Visitor())
 
@@ -308,7 +306,7 @@ class ReplaceTypingUnionWithPipe(Recipe):
                 self._remove_source_import(param_type.clazz, "Union")
 
                 # Create union type with all type parameters
-                return _create_union_type(list(type_params), param_type.prefix, param_type.type)
+                return _create_union_type(list(type_params), param_type)
 
             def visit_array_access(
                 self, array_access: ArrayAccess, p: ExecutionContext
@@ -340,6 +338,6 @@ class ReplaceTypingUnionWithPipe(Recipe):
                 self._remove_source_import(array_access.indexed, "Union")
 
                 # Create union type with all elements
-                return _create_union_type(elements, array_access.prefix, array_access.type)
+                return _create_union_type(elements, array_access)
 
         return Preconditions.check(uses_import("typing"), Visitor())

{openrewrite_migrate_python-0.17.0.dev20261015170646 → openrewrite_migrate_python-0.17.0.dev20261016170653}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.17.0.dev20261015170646
+Version: 0.17.0.dev20261016170653
 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.17.0.dev20261015170646 → openrewrite_migrate_python-0.17.0.dev20261016170653}/tests/test_typing_union_to_pipe.py

@@ -1,5 +1,6 @@
 """Tests for typing.Optional and typing.Union to PEP 604 migration recipes."""
 
+from rewrite import InMemoryExecutionContext, InMemoryLargeSourceSet, Recipe
 from rewrite.python.visitor import PythonVisitor
 from rewrite.test import RecipeSpec, python
 from openrewrite_migrate_python.migrate.typing_union_to_pipe import (
@@ -8,6 +9,18 @@ from openrewrite_migrate_python.migrate.typing_union_to_pipe import (
 )
 
 
+def _assert_idempotent(recipe: Recipe):
+    """Return an after_recipe callback that asserts running the recipe again produces no change."""
+    def check(source_file):
+        for r in recipe.run(InMemoryLargeSourceSet([source_file]), InMemoryExecutionContext()):
+            if r._after is not None and r._after is not r._before:
+                assert False, (
+                    f"Recipe is not idempotent. A second run changed\n"
+                    f"{source_file.print_all()!r}\ninto\n{r._after.print_all()!r}"
+                )
+    return check
+
+
 def _assert_built_nodes_typed(source_file):
     """``after_recipe`` hook: fail on a node the recipe left untyped, which a parse types."""
     untyped = []
@@ -450,3 +463,58 @@ class TestTypeCheckingBlocks:
                 """,
             )
         )
+
+
+class TestQuotedAnnotations:
+    """A quoted annotation parses to type nodes marked `Quoted`, which print the quotes back."""
+
+    def test_rewrites_quoted_optional(self):
+        recipe = ReplaceTypingOptionalWithUnion()
+        spec = RecipeSpec(recipe=recipe)
+        spec.rewrite_run(
+            python(
+                """
+                import typing
+                from typing import Dict, Optional
+                a: "Optional[int]" = None
+                b: "Dict[str, Optional[int]]" = {}
+                c: "typing.Optional[int]" = None
+                """,
+                """
+                from typing import Dict
+                a: "int | None" = None
+                b: "Dict[str, int | None]" = {}
+                c: "int | None" = None
+                """,
+                after_recipe=_assert_idempotent(recipe),
+            )
+        )
+
+    def test_rewrites_quoted_union(self):
+        spec = RecipeSpec(recipe=ReplaceTypingUnionWithPipe())
+        spec.rewrite_run(
+            python(
+                """
+                from typing import Union
+                a: "Union[int, str, bytes]" = 1
+                """,
+                """
+                a: "int | str | bytes" = 1
+                """,
+            )
+        )
+
+    def test_treats_quoted_annotated_metadata_as_data_not_a_type(self):
+        spec = RecipeSpec(recipe=ReplaceTypingOptionalWithUnion())
+        spec.rewrite_run(
+            python(
+                """
+                from typing import Annotated, Optional
+                x: Annotated["Optional[int]", "Optional[str]"] = None
+                """,
+                """
+                from typing import Annotated
+                x: Annotated["int | None", "Optional[str]"] = None
+                """,
+            )
+        )