openrewrite-migrate-python 0.14.0.dev20260909084854__tar.gz → 0.14.0.dev20260909100643__tar.gz

{openrewrite_migrate_python-0.14.0.dev20260909084854 → openrewrite_migrate_python-0.14.0.dev20260909100643}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260909084854
+Version: 0.14.0.dev20260909100643
 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.dev20260909084854 → openrewrite_migrate_python-0.14.0.dev20260909100643}/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.dev20260909084854"  # Updated dynamically during release
+version = "0.14.0.dev20260909100643"  # 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.dev20260909084854 → openrewrite_migrate_python-0.14.0.dev20260909100643}/src/openrewrite_migrate_python/migrate/typing_deprecations.py

@@ -20,12 +20,15 @@ handled with `ChangeImport` in `upgrade_to_python39`.
 See: https://peps.python.org/pep-0585/
 """
 
+import ast
 from typing import Any, ClassVar, Optional, Set, cast
 
 from rewrite import ExecutionContext, Recipe, Tree, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
+from rewrite.python.import_utils import referenced_names
+from rewrite.python.markers import Quoted
 from rewrite.python.scope_utils import LocalBindings
 from rewrite.visitor import Cursor
 
@@ -132,6 +135,44 @@ def _in_annotation(cursor: Cursor) -> bool:
     return False
 
 
+def _rename_in_quoted_body(body: str, old_name: str, new_name: str) -> Optional[str]:
+    """`body` with each name lookup of `old_name` renamed, or None when it holds none.
+
+    A quoted annotation carries a whole expression in one identifier, so the
+    rename has to land on its `ast.Name` nodes. Only parsing separates those
+    from a string constant the body encloses, where the name is a value:
+    renaming in `Literal['Text', 'Binary']` would change the type.
+    """
+    stripped = body.strip()
+    try:
+        expression = ast.parse(stripped, mode="eval")
+    except (SyntaxError, ValueError):
+        return None
+    matches = [
+        node
+        for node in ast.walk(expression)
+        if isinstance(node, ast.Name) and node.id == old_name
+    ]
+    if not matches:
+        return None
+
+    # `col_offset` counts UTF-8 bytes, so the splice has to happen in bytes.
+    source = stripped.encode()
+    line_starts = [0]
+    for line in source.split(b"\n"):
+        line_starts.append(line_starts[-1] + len(line) + 1)
+    for node in sorted(matches, key=lambda n: (n.lineno, n.col_offset), reverse=True):
+        line = line_starts[node.lineno - 1]
+        source = (
+            source[: line + node.col_offset]
+            + new_name.encode()
+            + source[line + cast(int, node.end_col_offset) :]
+        )
+
+    leading = len(body) - len(body.lstrip())
+    return body[:leading] + source.decode() + body[leading + len(stripped) :]
+
+
 def _make_builtin_alias_editor(
     old_name: str, new_name: str, annotations_only: bool
 ) -> "TreeVisitor[Any, ExecutionContext]":
@@ -200,7 +241,7 @@ def _make_builtin_alias_editor(
 
         def visit_identifier(self, ident: Identifier, p: ExecutionContext) -> J:
             ident = cast(Identifier, super().visit_identifier(ident, p))
-            if self._bare_ref is None or ident.simple_name != self._bare_ref:
+            if self._bare_ref is None or self._bare_ref not in referenced_names(ident):
                 return ident
 
             # Skip identifiers that are part of import statements
@@ -224,6 +265,9 @@ def _make_builtin_alias_editor(
             if annotations_only and not _in_annotation(self.cursor):
                 return ident
 
+            if ident.markers.find_first(Quoted) is not None:
+                renamed = _rename_in_quoted_body(ident.simple_name, self._bare_ref, new_name)
+                return ident if renamed is None else ident.replace(_simple_name=renamed)
             return ident.replace(_simple_name=new_name)
 
     return BuiltinAliasVisitor()

{openrewrite_migrate_python-0.14.0.dev20260909084854 → openrewrite_migrate_python-0.14.0.dev20260909100643}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260909084854
+Version: 0.14.0.dev20260909100643
 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.dev20260909084854 → openrewrite_migrate_python-0.14.0.dev20260909100643}/tests/test_typing_deprecations.py

@@ -410,26 +410,6 @@ class TestPep585CornerCases:
             )
         )
 
-    def test_keeps_import_used_by_string_annotation(self):
-        """The import stays while a string annotation still references it."""
-        spec = RecipeSpec(recipe=ReplaceTypingListWithList())
-        spec.rewrite_run(
-            python(
-                """
-                from typing import List
-                x: List[int] = []
-                def f() -> "List[int]":
-                    return x
-                """,
-                """
-                from typing import List
-                x: list[int] = []
-                def f() -> "List[int]":
-                    return x
-                """,
-            )
-        )
-
     def test_removes_import_when_only_a_docstring_mentions_the_name(self):
         """Prose that happens to spell the name is not a reference to it."""
         spec = RecipeSpec(recipe=ReplaceTypingListWithList())
@@ -457,35 +437,59 @@ class TestPep585CornerCases:
             )
         )
 
-    def test_keeps_import_used_by_quoted_annotation(self):
-        """A quoted annotation the rename leaves alone still needs the import."""
+    def test_renames_inside_quoted_annotations(self):
+        """A quoted annotation holds an expression; every lookup of the alias in it is renamed."""
         spec = RecipeSpec(recipe=ReplaceTypingListWithList())
         spec.rewrite_run(
             python(
                 """
-                from typing import List
-                x: List[int] = []
-                y: "List[int]" = []
+                from typing import Dict, List
+                a: "List" = []
+                b: "List[int]" = []
+                c: "Dict[str, List[int]]" = {}
+                d: "  List[int]  " = []
+                e: "dict[Café, List[int]]" = {}
                 """,
                 """
-                from typing import List
-                x: list[int] = []
-                y: "List[int]" = []
+                from typing import Dict
+                a: "list" = []
+                b: "list[int]" = []
+                c: "Dict[str, list[int]]" = {}
+                d: "  list[int]  " = []
+                e: "dict[Café, list[int]]" = {}
                 """,
             )
         )
 
-    def test_removes_import_when_the_quoted_annotation_is_renamed(self):
-        """The rename reaches inside a bare quoted annotation, freeing the import."""
+    def test_leaves_quoted_names_that_are_not_a_lookup_alone(self):
+        """In a quoted body only an `ast.Name` is a lookup of the alias."""
         spec = RecipeSpec(recipe=ReplaceTypingListWithList())
         spec.rewrite_run(
             python(
                 """
-                from typing import List
-                x: "List" = []
+                from typing import List, Literal
+
+                alias = List
+                a: "MyList" = []
+                b: "ListLike[int]" = []
+                c: "mod.List[int]" = []
+                d: "Literal['List', 'Tuple']" = "List"
+                """
+            )
+        )
+
+    def test_leaves_quoted_annotated_metadata_alone(self):
+        """The parser quotes `Annotated` metadata like a type; only its first argument is one."""
+        spec = RecipeSpec(recipe=ReplaceTypingListWithList())
+        spec.rewrite_run(
+            python(
+                """
+                from typing import Annotated, List
+                x: Annotated["List[int]", "List"] = []
                 """,
                 """
-                x: "list" = []
+                from typing import Annotated, List
+                x: Annotated["list[int]", "List"] = []
                 """,
             )
         )