openrewrite-migrate-python 0.6.0.dev20260418171218__tar.gz → 0.6.0.dev20260420171522__tar.gz

{openrewrite_migrate_python-0.6.0.dev20260418171218 → openrewrite_migrate_python-0.6.0.dev20260420171522}/PKG-INFO

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

{openrewrite_migrate_python-0.6.0.dev20260418171218 → openrewrite_migrate_python-0.6.0.dev20260420171522}/src/openrewrite_migrate_python/migrate/__init__.py

@@ -86,6 +86,13 @@ from .threading_deprecations import (
     ReplaceThreadingCurrentThread,
 )
 from .typing_callable import ReplaceTypingCallableWithCollectionsAbcCallable
+from .typing_deprecations import (
+    ReplaceTypingDictWithDict,
+    ReplaceTypingListWithList,
+    ReplaceTypingSetWithSet,
+    ReplaceTypingText,
+    ReplaceTypingTupleWithTuple,
+)
 from .typing_union_to_pipe import (
     ReplaceTypingOptionalWithUnion,
     ReplaceTypingUnionWithPipe,
@@ -194,7 +201,12 @@ __all__ = [
     "ReplaceThreadingCurrentThread",
     # Auto-fix: Typing
     "ReplaceTypingCallableWithCollectionsAbcCallable",
+    "ReplaceTypingDictWithDict",
+    "ReplaceTypingListWithList",
     "ReplaceTypingOptionalWithUnion",
+    "ReplaceTypingSetWithSet",
+    "ReplaceTypingText",
+    "ReplaceTypingTupleWithTuple",
     "ReplaceTypingUnionWithPipe",
     # Auto-fix: Unittest
     "ReplaceUnittestDeprecatedAliases",

{openrewrite_migrate_python-0.6.0.dev20260418171218 → openrewrite_migrate_python-0.6.0.dev20260420171522}/src/openrewrite_migrate_python/migrate/pkgutil_deprecations.py

@@ -9,15 +9,17 @@ Several pkgutil functions were deprecated in Python 3.12:
 See: https://docs.python.org/3/library/pkgutil.html
 """
 
-from typing import Any, Optional
+from typing import Any, Optional, cast
 
 from rewrite import ExecutionContext, Recipe, TreeVisitor
 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 Identifier, MethodInvocation
-from ._markers import mark_deprecated
+from rewrite.python.template import pattern, template, capture
+from rewrite.python.add_import import AddImportOptions, maybe_add_import
+from rewrite.python.remove_import import RemoveImportOptions, maybe_remove_import
+from rewrite.java.tree import J, MethodInvocation
 
 # Define category path: Python > Migrate > Python 3.12
 _Python312 = [
@@ -26,29 +28,17 @@ _Python312 = [
     CategoryDescriptor(display_name="Python 3.12"),
 ]
 
-
-def _is_pkgutil_method(method: MethodInvocation, method_name: str) -> bool:
-    """
-    Check if this is a pkgutil.method_name() call using type attribution.
-    """
-    if not isinstance(method.name, Identifier):
-        return False
-    if method.name.simple_name != method_name:
-        return False
-
-    if not method.method_type or not method.method_type.declaring_type:
-        return False
-    dt = method.method_type.declaring_type
-    if not hasattr(dt, '_fully_qualified_name'):
-        return False
-    fqn = str(dt._fully_qualified_name)
-    return 'pkgutil' in fqn
+# Pattern/template pairs
+_mod = capture('mod')
+_find_loader_pattern = pattern("pkgutil.find_loader({mod})", mod=_mod)
+_get_loader_pattern = pattern("pkgutil.get_loader({mod})", mod=_mod)
+_find_spec_template = template("importlib.util.find_spec({mod})", mod=_mod)
 
 
 @categorize(_Python312)
 class ReplacePkgutilFindLoader(Recipe):
     """
-    Find and migrate `pkgutil.find_loader()` calls to `importlib.util.find_spec()`.
+    Replace `pkgutil.find_loader()` with `importlib.util.find_spec()`.
 
     The `pkgutil.find_loader()` function was deprecated in Python 3.12.
     The recommended replacement is `importlib.util.find_spec()`.
@@ -64,7 +54,6 @@ class ReplacePkgutilFindLoader(Recipe):
         After:
             import importlib.util
             spec = importlib.util.find_spec('mymodule')
-            loader = spec.loader if spec else None
     """
 
     @property
@@ -84,19 +73,19 @@ class ReplacePkgutilFindLoader(Recipe):
 
     def editor(self) -> TreeVisitor[Any, ExecutionContext]:
         class Visitor(PythonVisitor[ExecutionContext]):
-            def visit_method_invocation(
+            def visit_method_invocation(  # type: ignore[override]
                 self, method: MethodInvocation, p: ExecutionContext
-            ) -> Optional[MethodInvocation]:
-                method = super().visit_method_invocation(method, p)
-
-                if _is_pkgutil_method(method, "find_loader"):
-                    return mark_deprecated(
-                        method,
-                        "pkgutil.find_loader() is deprecated",
-                        "Replace with importlib.util.find_spec() (Python 3.12+)"
+            ) -> Optional[J]:
+                m = cast(MethodInvocation, super().visit_method_invocation(method, p))
+                match = _find_loader_pattern.match(m, self.cursor)
+                if match:
+                    maybe_add_import(
+                        self,
+                        AddImportOptions(module="importlib.util", only_if_referenced=False),
                     )
-
-                return method
+                    maybe_remove_import(self, RemoveImportOptions(module="pkgutil"))
+                    return _find_spec_template.apply(self.cursor, values=match)
+                return m
 
         return Visitor()
 
@@ -104,7 +93,7 @@ class ReplacePkgutilFindLoader(Recipe):
 @categorize(_Python312)
 class ReplacePkgutilGetLoader(Recipe):
     """
-    Find and migrate `pkgutil.get_loader()` calls to `importlib.util.find_spec()`.
+    Replace `pkgutil.get_loader()` with `importlib.util.find_spec()`.
 
     The `pkgutil.get_loader()` function was deprecated in Python 3.12.
     The recommended replacement is `importlib.util.find_spec()`.
@@ -117,7 +106,6 @@ class ReplacePkgutilGetLoader(Recipe):
         After:
             import importlib.util
             spec = importlib.util.find_spec('mymodule')
-            loader = spec.loader if spec else None
     """
 
     @property
@@ -137,18 +125,18 @@ class ReplacePkgutilGetLoader(Recipe):
 
     def editor(self) -> TreeVisitor[Any, ExecutionContext]:
         class Visitor(PythonVisitor[ExecutionContext]):
-            def visit_method_invocation(
+            def visit_method_invocation(  # type: ignore[override]
                 self, method: MethodInvocation, p: ExecutionContext
-            ) -> Optional[MethodInvocation]:
-                method = super().visit_method_invocation(method, p)
-
-                if _is_pkgutil_method(method, "get_loader"):
-                    return mark_deprecated(
-                        method,
-                        "pkgutil.get_loader() is deprecated",
-                        "Replace with importlib.util.find_spec() (Python 3.12+)"
+            ) -> Optional[J]:
+                m = cast(MethodInvocation, super().visit_method_invocation(method, p))
+                match = _get_loader_pattern.match(m, self.cursor)
+                if match:
+                    maybe_add_import(
+                        self,
+                        AddImportOptions(module="importlib.util", only_if_referenced=False),
                     )
-
-                return method
+                    maybe_remove_import(self, RemoveImportOptions(module="pkgutil"))
+                    return _find_spec_template.apply(self.cursor, values=match)
+                return m
 
         return Visitor()

openrewrite_migrate_python-0.6.0.dev20260420171522/src/openrewrite_migrate_python/migrate/typing_callable.py

@@ -0,0 +1,62 @@
+"""
+Recipe for migrating typing.Callable to collections.abc.Callable.
+
+PEP 585 (Python 3.9+) deprecated typing.Callable in favor of
+collections.abc.Callable:
+
+- typing.Callable[[int], str] -> collections.abc.Callable[[int], str]
+
+See: https://peps.python.org/pep-0585/
+"""
+
+from typing import List
+
+from rewrite import Recipe
+from rewrite.category import CategoryDescriptor
+from rewrite.decorators import categorize
+from rewrite.marketplace import Python
+from rewrite.python.recipes import ChangeImport
+
+# Define category path
+_Python39 = [
+    *Python,
+    CategoryDescriptor(display_name="Migrate"),
+    CategoryDescriptor(display_name="Python 3.9"),
+]
+
+
+@categorize(_Python39)
+class ReplaceTypingCallableWithCollectionsAbcCallable(Recipe):
+    """
+    Replace `typing.Callable` with `collections.abc.Callable`.
+
+    PEP 585 deprecated `typing.Callable` in Python 3.9. Use
+    `collections.abc.Callable` instead for type annotations.
+
+    Example:
+        Before:
+            from typing import Callable
+            handler: Callable[[int], str] = lambda x: str(x)
+
+        After:
+            from collections.abc import Callable
+            handler: Callable[[int], str] = lambda x: str(x)
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingCallableWithCollectionsAbcCallable"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.Callable` with `collections.abc.Callable`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "PEP 585 deprecated `typing.Callable` in Python 3.9. "
+            "Replace with `collections.abc.Callable` for type annotations."
+        )
+
+    def recipe_list(self) -> List[Recipe]:
+        return [ChangeImport(old_module="typing", old_name="Callable", new_module="collections.abc")]

openrewrite_migrate_python-0.6.0.dev20260420171522/src/openrewrite_migrate_python/migrate/typing_deprecations.py

@@ -0,0 +1,406 @@
+"""
+Recipes for migrating deprecated typing module aliases to built-in generics.
+
+PEP 585 (Python 3.9+) deprecated many typing module aliases in favor of
+using built-in types directly as generics:
+
+- typing.List[X] -> list[X]
+- typing.Dict[K, V] -> dict[K, V]
+- typing.Set[X] -> set[X]
+- typing.FrozenSet[X] -> frozenset[X]
+- typing.Tuple[X, ...] -> tuple[X, ...]
+- typing.Type[X] -> type[X]
+
+Additionally, typing.Text is deprecated (alias for str since Python 3.11).
+
+See: https://peps.python.org/pep-0585/
+"""
+
+from typing import Any, Dict, List, Optional, cast
+
+from rewrite import ExecutionContext, Recipe, TreeVisitor
+from rewrite.category import CategoryDescriptor
+from rewrite.decorators import categorize
+from rewrite.marketplace import Python
+from rewrite.python.remove_import import RemoveImportOptions, maybe_remove_import
+from rewrite.python.visitor import PythonVisitor
+from rewrite.java.tree import Identifier, J
+
+# Define category paths
+_Python39 = [
+    *Python,
+    CategoryDescriptor(display_name="Migrate"),
+    CategoryDescriptor(display_name="Python 3.9"),
+]
+
+_Python311 = [
+    *Python,
+    CategoryDescriptor(display_name="Migrate"),
+    CategoryDescriptor(display_name="Python 3.11"),
+]
+
+
+# PEP 585 deprecated typing aliases -> built-in replacements
+PEP585_DEPRECATIONS: Dict[str, str] = {
+    "List": "list",
+    "Dict": "dict",
+    "Set": "set",
+    "FrozenSet": "frozenset",
+    "Tuple": "tuple",
+    "Type": "type",
+}
+
+
+def _make_pep585_editor(old_name: str, new_name: str) -> "TreeVisitor[Any, ExecutionContext]":
+    """Create a visitor that renames a typing alias to its built-in equivalent.
+
+    The visitor:
+    1. Checks whether ``from typing import <old_name>`` is present. If not,
+       returns the compilation unit unchanged (fast-path).
+    2. Renames every occurrence of the identifier outside of import statements.
+    3. Removes the ``<old_name>`` entry from the ``from typing import …``
+       statement (deleting the whole statement when it becomes empty).
+    """
+    from rewrite.python.tree import CompilationUnit, MultiImport
+    from rewrite.java.support_types import JContainer
+    from rewrite.java.tree import FieldAccess, Space
+
+    class Pep585Visitor(PythonVisitor[ExecutionContext]):
+        def __init__(self) -> None:
+            super().__init__()
+            self._has_import: bool = False
+
+        # ------------------------------------------------------------------
+        # Helpers
+        # ------------------------------------------------------------------
+
+        @staticmethod
+        def _get_qualid_name(node: Any) -> str:
+            """Get string representation of a qualified name (FieldAccess or Identifier)."""
+            if isinstance(node, Identifier):
+                return node.simple_name
+            if isinstance(node, FieldAccess):
+                target = Pep585Visitor._get_qualid_name(node.target)
+                name = node.name.simple_name
+                return f"{target}.{name}" if target else name
+            # Empty or unknown
+            return ""
+
+        @staticmethod
+        def _import_names(multi: MultiImport) -> list:
+            """Return the list of name strings imported by a MultiImport."""
+            return [
+                Pep585Visitor._get_qualid_name(imp.qualid)
+                for imp in multi.names
+            ]
+
+        @staticmethod
+        def _is_typing_import(multi: MultiImport) -> bool:
+            return (
+                multi.from_ is not None
+                and Pep585Visitor._get_qualid_name(multi.from_) == "typing"
+            )
+
+        # ------------------------------------------------------------------
+        # Pre-scan: detect whether the import is present
+        # ------------------------------------------------------------------
+
+        def visit_compilation_unit(
+            self, cu: CompilationUnit, p: ExecutionContext
+        ) -> CompilationUnit:
+            self._has_import = any(
+                self._is_typing_import(stmt) and old_name in self._import_names(stmt)
+                for stmt in cu.statements
+                if isinstance(stmt, MultiImport)
+            )
+            if not self._has_import:
+                return cu
+
+            result = cast(CompilationUnit, super().visit_compilation_unit(cu, p))
+
+            # After import removal, the first remaining statement may have an
+            # unwanted leading newline in its prefix (the newline that
+            # previously separated it from the removed import).  Strip it.
+            from rewrite.java.support_types import JRightPadded
+
+            padded_stmts = list(result.padding.statements)
+            if padded_stmts:
+                first_padded = padded_stmts[0]
+                first_stmt = first_padded.element
+                prefix = first_stmt.prefix
+                if prefix.whitespace and prefix.whitespace.startswith('\n'):
+                    new_ws = prefix.whitespace[1:]
+                    new_prefix = prefix.replace(_whitespace=new_ws)
+                    padded_stmts[0] = JRightPadded(
+                        first_stmt.replace(prefix=new_prefix),
+                        first_padded.after,
+                        first_padded.markers,
+                    )
+                    result = result.padding.replace(_statements=padded_stmts)
+
+            return result
+
+        # ------------------------------------------------------------------
+        # Import removal
+        # ------------------------------------------------------------------
+
+        def visit_multi_import(  # type: ignore[override]
+            self, multi: MultiImport, p: ExecutionContext
+        ) -> Optional[J]:
+            if not self._has_import:
+                return multi
+            if not self._is_typing_import(multi):
+                return multi
+            if old_name not in self._import_names(multi):
+                return multi
+
+            # Remove old_name from the import list
+            existing_padded = multi.padding.names.padding.elements
+            new_padded = [
+                ep for ep in existing_padded
+                if self._get_qualid_name(ep.element.qualid) != old_name
+            ]
+
+            if len(new_padded) == 0:
+                # All names removed — delete the statement
+                return None
+
+            # Fix prefix on the first remaining element
+            if new_padded:
+                first = new_padded[0]
+                if first.element.prefix != Space.EMPTY:
+                    new_padded[0] = first.replace(
+                        _element=first.element.replace(prefix=Space.EMPTY)
+                    )
+
+            return multi.padding.replace(
+                _names=JContainer(
+                    multi.padding.names.before,
+                    new_padded,
+                    multi.padding.names.markers,
+                )
+            )
+
+        # ------------------------------------------------------------------
+        # Identifier renaming (outside imports)
+        # ------------------------------------------------------------------
+
+        def visit_identifier(
+            self, ident: Identifier, p: ExecutionContext
+        ) -> Identifier:
+            ident = cast(Identifier, super().visit_identifier(ident, p))
+
+            if ident.simple_name != old_name:
+                return ident
+
+            # Skip identifiers that are part of import statements
+            if self.cursor.first_enclosing(MultiImport) is not None:
+                return ident
+
+            return ident.replace(_simple_name=new_name)
+
+    return Pep585Visitor()
+
+
+@categorize(_Python39)
+class ReplaceTypingListWithList(Recipe):
+    """
+    Find and migrate `typing.List` to built-in `list`.
+
+    PEP 585 deprecated `typing.List` in Python 3.9. The built-in `list` type
+    can now be used directly as a generic type.
+
+    Example:
+        Before:
+            from typing import List
+            items: List[str] = []
+
+        After:
+            items: list[str] = []
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingListWithList"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.List` with `list`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "PEP 585 deprecated `typing.List` in Python 3.9. "
+            "Replace with the built-in `list` type for generic annotations."
+        )
+
+    def editor(self) -> TreeVisitor[Any, ExecutionContext]:
+        return _make_pep585_editor("List", "list")
+
+
+@categorize(_Python39)
+class ReplaceTypingDictWithDict(Recipe):
+    """
+    Find and migrate `typing.Dict` to built-in `dict`.
+
+    PEP 585 deprecated `typing.Dict` in Python 3.9. The built-in `dict` type
+    can now be used directly as a generic type.
+
+    Example:
+        Before:
+            from typing import Dict
+            mapping: Dict[str, int] = {}
+
+        After:
+            mapping: dict[str, int] = {}
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingDictWithDict"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.Dict` with `dict`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "PEP 585 deprecated `typing.Dict` in Python 3.9. "
+            "Replace with the built-in `dict` type for generic annotations."
+        )
+
+    def editor(self) -> TreeVisitor[Any, ExecutionContext]:
+        return _make_pep585_editor("Dict", "dict")
+
+
+@categorize(_Python39)
+class ReplaceTypingSetWithSet(Recipe):
+    """
+    Find and migrate `typing.Set` to built-in `set`.
+
+    PEP 585 deprecated `typing.Set` in Python 3.9. The built-in `set` type
+    can now be used directly as a generic type.
+
+    Example:
+        Before:
+            from typing import Set
+            items: Set[int] = set()
+
+        After:
+            items: set[int] = set()
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingSetWithSet"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.Set` with `set`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "PEP 585 deprecated `typing.Set` in Python 3.9. "
+            "Replace with the built-in `set` type for generic annotations."
+        )
+
+    def editor(self) -> TreeVisitor[Any, ExecutionContext]:
+        return _make_pep585_editor("Set", "set")
+
+
+@categorize(_Python39)
+class ReplaceTypingTupleWithTuple(Recipe):
+    """
+    Find and migrate `typing.Tuple` to built-in `tuple`.
+
+    PEP 585 deprecated `typing.Tuple` in Python 3.9. The built-in `tuple` type
+    can now be used directly as a generic type.
+
+    Example:
+        Before:
+            from typing import Tuple
+            point: Tuple[int, int] = (0, 0)
+
+        After:
+            point: tuple[int, int] = (0, 0)
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingTupleWithTuple"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.Tuple` with `tuple`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "PEP 585 deprecated `typing.Tuple` in Python 3.9. "
+            "Replace with the built-in `tuple` type for generic annotations."
+        )
+
+    def editor(self) -> TreeVisitor[Any, ExecutionContext]:
+        return _make_pep585_editor("Tuple", "tuple")
+
+
+@categorize(_Python311)
+class ReplaceTypingText(Recipe):
+    """
+    Find and migrate `typing.Text` to `str`.
+
+    `typing.Text` was an alias for `str` provided for Python 2/3 compatibility.
+    It is deprecated as of Python 3.11 since Python 2 is no longer supported.
+
+    Example:
+        Before:
+            from typing import Text
+            name: Text = "hello"
+
+        After:
+            name: str = "hello"
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.ReplaceTypingText"
+
+    @property
+    def display_name(self) -> str:
+        return "Replace `typing.Text` with `str`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "`typing.Text` is deprecated as of Python 3.11. "
+            "It was an alias for `str` for Python 2/3 compatibility. Replace with `str`."
+        )
+
+    def editor(self) -> TreeVisitor[Any, ExecutionContext]:
+        from rewrite.python.tree import MultiImport
+
+        class Visitor(PythonVisitor[ExecutionContext]):
+            def visit_identifier(
+                self, ident: Identifier, p: ExecutionContext
+            ) -> Identifier:
+                ident = cast(Identifier, super().visit_identifier(ident, p))
+
+                if ident.simple_name != "Text":
+                    return ident
+
+                # Skip identifiers inside import statements
+                if self.cursor.first_enclosing(MultiImport) is not None:
+                    return ident
+
+                # Type attribution correctly resolves typing.Text to str
+                # (since Text is just an alias), so we can't use field_type to
+                # confirm the import origin. Instead we rely on the name check
+                # and the import-context guard above.
+                maybe_remove_import(
+                    self, RemoveImportOptions(module="typing", name="Text")
+                )
+                return ident.replace(_simple_name="str")
+
+        return Visitor()

{openrewrite_migrate_python-0.6.0.dev20260418171218 → openrewrite_migrate_python-0.6.0.dev20260420171522}/src/openrewrite_migrate_python.egg-info/PKG-INFO

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