openrewrite-migrate-python 0.1.1__tar.gz → 0.2.0__tar.gz

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.1.1
+Version: 0.2.0
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary
@@ -21,7 +21,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: openrewrite>=8.74.0.dev20260224100132; extra == "dev"
+Requires-Dist: openrewrite>=8.74.3; extra == "dev"
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: black>=24.0.0; extra == "dev"

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/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.1.1"  # Updated dynamically during release
+version = "0.2.0"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"
@@ -30,7 +30,7 @@ dependencies = []
 
 [project.optional-dependencies]
 dev = [
-    "openrewrite>=8.74.0.dev20260224100132",
+    "openrewrite>=8.74.3",
     "pytest>=8.0.0",
     "pytest-cov>=4.0.0",
     "black>=24.0.0",

openrewrite_migrate_python-0.2.0/src/openrewrite_migrate_python/migrate/_markers.py

@@ -0,0 +1,16 @@
+"""Shared marker utilities for deprecation recipes."""
+
+from typing import Any, Optional
+
+from rewrite.markers import Markers, SearchResult
+from rewrite.utils import random_id
+
+
+def mark_deprecated(tree: Any, message: str, detail: Optional[str] = None) -> Any:
+    """Add a SearchResult marker for a deprecation warning."""
+    full_message = f"{message}: {detail}" if detail else message
+    search_marker = SearchResult(random_id(), full_message)
+    current_markers = tree.markers
+    new_markers_list = list(current_markers.markers) + [search_marker]
+    new_markers = Markers(current_markers.id, new_markers_list)
+    return tree.replace(_markers=new_markers)

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/aifc_migrations.py

@@ -17,11 +17,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.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport, Import
 from rewrite.java.tree import Identifier, FieldAccess
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.13
 _Python313 = [
@@ -31,15 +30,6 @@ _Python313 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 def _get_import_name(import_node: Any) -> Optional[str]:
     """Extract the module name from an import node's qualid."""
     qualid = import_node.qualid
@@ -94,7 +84,7 @@ class FindAifcModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "aifc":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `aifc` module was removed in Python 3.13. "
                             "Use third-party audio libraries instead."
@@ -103,7 +93,7 @@ class FindAifcModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "aifc":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `aifc` module was removed in Python 3.13. "
                                 "Use third-party audio libraries instead."
@@ -119,7 +109,7 @@ class FindAifcModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "aifc":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `aifc` module was removed in Python 3.13. "
                         "Use third-party audio libraries instead."
@@ -172,7 +162,7 @@ class FindAudioopModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "audioop":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `audioop` module was removed in Python 3.13. "
                             "Use pydub, numpy, or scipy instead."
@@ -181,7 +171,7 @@ class FindAudioopModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "audioop":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `audioop` module was removed in Python 3.13. "
                                 "Use pydub, numpy, or scipy instead."
@@ -197,7 +187,7 @@ class FindAudioopModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "audioop":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `audioop` module was removed in Python 3.13. "
                         "Use pydub, numpy, or scipy instead."
@@ -247,7 +237,7 @@ class FindChunkModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "chunk":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `chunk` module was removed in Python 3.13."
                         )
@@ -255,7 +245,7 @@ class FindChunkModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "chunk":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `chunk` module was removed in Python 3.13."
                             )
@@ -270,7 +260,7 @@ class FindChunkModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "chunk":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `chunk` module was removed in Python 3.13."
                     )
@@ -324,7 +314,7 @@ class FindImghdrModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "imghdr":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `imghdr` module was removed in Python 3.13. "
                             "Use `filetype`, `python-magic`, or `Pillow` instead."
@@ -333,7 +323,7 @@ class FindImghdrModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "imghdr":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `imghdr` module was removed in Python 3.13. "
                                 "Use `filetype`, `python-magic`, or `Pillow` instead."
@@ -349,7 +339,7 @@ class FindImghdrModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "imghdr":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `imghdr` module was removed in Python 3.13. "
                         "Use `filetype`, `python-magic`, or `Pillow` instead."
@@ -403,7 +393,7 @@ class FindSndhdrModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "sndhdr":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `sndhdr` module was removed in Python 3.13. "
                             "Use `filetype` or audio libraries instead."
@@ -412,7 +402,7 @@ class FindSndhdrModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "sndhdr":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `sndhdr` module was removed in Python 3.13. "
                                 "Use `filetype` or audio libraries instead."
@@ -428,7 +418,7 @@ class FindSndhdrModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "sndhdr":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `sndhdr` module was removed in Python 3.13. "
                         "Use `filetype` or audio libraries instead."
@@ -482,7 +472,7 @@ class FindSunauModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "sunau":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `sunau` module was removed in Python 3.13. "
                             "Use `soundfile` or `pydub` instead."
@@ -491,7 +481,7 @@ class FindSunauModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "sunau":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `sunau` module was removed in Python 3.13. "
                                 "Use `soundfile` or `pydub` instead."
@@ -507,7 +497,7 @@ class FindSunauModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "sunau":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `sunau` module was removed in Python 3.13. "
                         "Use `soundfile` or `pydub` instead."

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/asyncio_deprecations.py

@@ -22,10 +22,9 @@ 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.python.visitor import PythonVisitor
 from rewrite.java.tree import Identifier, MethodInvocation, FieldAccess
-from rewrite.utils import random_id
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.11
 _Python311 = [
@@ -35,16 +34,6 @@ _Python311 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str, detail: Optional[str] = None) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    full_message = f"{message}: {detail}" if detail else message
-    search_marker = SearchResult(random_id(), full_message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 def _is_asyncio_coroutine_access(node: Any) -> bool:
     """Check if this is an asyncio.coroutine access."""
     # Check for asyncio.coroutine pattern
@@ -106,7 +95,7 @@ class FindAsyncioCoroutineDecorator(Recipe):
                 field_access = super().visit_field_access(field_access, p)
 
                 if _is_asyncio_coroutine_access(field_access):
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         field_access,
                         "@asyncio.coroutine is deprecated",
                         "Use 'async def' instead (removed in Python 3.11)"

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/cgi_migrations.py

@@ -20,11 +20,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.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport, Import
 from rewrite.java.tree import Identifier, FieldAccess
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.13
 _Python313 = [
@@ -34,15 +33,6 @@ _Python313 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 def _get_import_name(import_node: Any) -> Optional[str]:
     """Extract the module name from an import node's qualid."""
     qualid = import_node.qualid
@@ -100,7 +90,7 @@ class FindCgiModule(Recipe):
                 if from_part is not None:
                     # Handle 'from cgi import ...' pattern
                     if isinstance(from_part, Identifier) and from_part.simple_name == "cgi":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `cgi` module was removed in Python 3.13. "
                             "Use urllib.parse for query parsing, html.escape() for escaping."
@@ -110,7 +100,7 @@ class FindCgiModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "cgi":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `cgi` module was removed in Python 3.13. "
                                 "Use urllib.parse for query parsing, html.escape() for escaping."
@@ -126,7 +116,7 @@ class FindCgiModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "cgi":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `cgi` module was removed in Python 3.13. "
                         "Use urllib.parse for query parsing, html.escape() for escaping."
@@ -178,7 +168,7 @@ class FindCgitbModule(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == "cgitb":
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "The `cgitb` module was removed in Python 3.13. "
                             "Use logging and traceback modules instead."
@@ -187,7 +177,7 @@ class FindCgitbModule(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == "cgitb":
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "The `cgitb` module was removed in Python 3.13. "
                                 "Use logging and traceback modules instead."
@@ -203,7 +193,7 @@ class FindCgitbModule(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == "cgitb":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "The `cgitb` module was removed in Python 3.13. "
                         "Use logging and traceback modules instead."

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/cgi_parse_deprecations.py

@@ -16,10 +16,9 @@ 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.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java.tree import Identifier, MethodInvocation
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.8
 _Python38 = [
@@ -29,15 +28,6 @@ _Python38 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_Python38)
 class FindCgiParseQs(Recipe):
     """
@@ -95,7 +85,7 @@ class FindCgiParseQs(Recipe):
                 if select.simple_name != "cgi":
                     return method
 
-                return _mark_deprecated(
+                return mark_deprecated(
                     method,
                     "cgi.parse_qs() was removed in Python 3.8. "
                     "Use urllib.parse.parse_qs() instead."
@@ -161,7 +151,7 @@ class FindCgiParseQsl(Recipe):
                 if select.simple_name != "cgi":
                     return method
 
-                return _mark_deprecated(
+                return mark_deprecated(
                     method,
                     "cgi.parse_qsl() was removed in Python 3.8. "
                     "Use urllib.parse.parse_qsl() instead."

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/distutils_deprecations.py

@@ -19,10 +19,9 @@ 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.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport
-from rewrite.utils import random_id
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.12
 _Python312 = [
@@ -32,16 +31,6 @@ _Python312 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str, detail: Optional[str] = None) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    full_message = f"{message}: {detail}" if detail else message
-    search_marker = SearchResult(random_id(), full_message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_Python312)
 class FindDistutilsUsage(Recipe):
     """
@@ -96,7 +85,7 @@ class FindDistutilsUsage(Recipe):
                     # Get the string representation of the from part
                     from_str = from_part.print_all() if hasattr(from_part, 'print_all') else str(from_part)
                     if 'distutils' in from_str:
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "distutils is deprecated",
                             "Migrate to setuptools (removed in Python 3.12)"

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/distutils_migrations.py

@@ -23,10 +23,9 @@ 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.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport
-from rewrite.utils import random_id
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.12
 _Python312 = [
@@ -36,16 +35,6 @@ _Python312 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str, detail: Optional[str] = None) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    full_message = f"{message}: {detail}" if detail else message
-    search_marker = SearchResult(random_id(), full_message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_Python312)
 class ReplaceDistutilsVersion(Recipe):
     """
@@ -113,7 +102,7 @@ class ReplaceDistutilsVersion(Recipe):
                         # Check what's being imported
                         imports_str = multi.print_all() if hasattr(multi, 'print_all') else str(multi)
                         if 'LooseVersion' in imports_str or 'StrictVersion' in imports_str:
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "distutils.version is deprecated",
                                 "Migrate to packaging.version.Version (removed in Python 3.12). "

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/functools_deprecations.py

@@ -15,10 +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.markers import Markers, SearchResult
-from rewrite.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java.tree import Identifier, MethodInvocation
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.8
 _Python38 = [
@@ -28,15 +27,6 @@ _Python38 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_Python38)
 class FindFunctoolsCmpToKey(Recipe):
     """
@@ -87,7 +77,7 @@ class FindFunctoolsCmpToKey(Recipe):
 
                 select = method.select
                 if isinstance(select, Identifier) and select.simple_name == "functools":
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         method,
                         "functools.cmp_to_key() is a Python 2 compatibility function. "
                         "Consider using a key function directly."

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/html_parser_deprecations.py

@@ -13,10 +13,9 @@ 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.utils import random_id
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java.tree import Identifier, MethodInvocation
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.9
 _Python39 = [
@@ -26,15 +25,6 @@ _Python39 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_Python39)
 class FindHtmlParserUnescape(Recipe):
     """
@@ -101,7 +91,7 @@ class FindHtmlParserUnescape(Recipe):
                 if method.select is None:
                     return method
 
-                return _mark_deprecated(
+                return mark_deprecated(
                     method,
                     "HTMLParser.unescape() was removed in Python 3.9. "
                     "Use html.unescape() instead."

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/imp_migrations.py

@@ -21,11 +21,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.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport, Import
 from rewrite.java.tree import FieldAccess, Identifier
-from rewrite.utils import random_id
+from ._markers import mark_deprecated
 
 # Define category path: Python > Migrate > Python 3.12
 _Python312 = [
@@ -35,16 +34,6 @@ _Python312 = [
 ]
 
 
-def _mark_deprecated(tree: Any, message: str, detail: Optional[str] = None) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    full_message = f"{message}: {detail}" if detail else message
-    search_marker = SearchResult(random_id(), full_message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 def _get_import_name(import_node: Any) -> Optional[str]:
     """Extract the module name from an import node's qualid."""
     qualid = import_node.qualid
@@ -100,7 +89,7 @@ class FindImpUsage(Recipe):
                 from_part = multi.from_
                 if from_part is not None:
                     if isinstance(from_part, Identifier) and from_part.simple_name == 'imp':
-                        return _mark_deprecated(
+                        return mark_deprecated(
                             multi,
                             "imp module is deprecated",
                             "Migrate to importlib (removed in Python 3.12)"
@@ -109,7 +98,7 @@ class FindImpUsage(Recipe):
                     for import_node in multi.names:
                         name = _get_import_name(import_node)
                         if name == 'imp':
-                            return _mark_deprecated(
+                            return mark_deprecated(
                                 multi,
                                 "imp module is deprecated",
                                 "Migrate to importlib (removed in Python 3.12)"
@@ -125,7 +114,7 @@ class FindImpUsage(Recipe):
                     return import_stmt
                 name = _get_import_name(import_stmt)
                 if name == 'imp':
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         import_stmt,
                         "imp module is deprecated",
                         "Migrate to importlib (removed in Python 3.12)"

{openrewrite_migrate_python-0.1.1 → openrewrite_migrate_python-0.2.0}/src/openrewrite_migrate_python/migrate/langchain_classic_imports.py

@@ -18,11 +18,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.python.visitor import PythonVisitor
 from rewrite.python.tree import MultiImport
 from rewrite.java.tree import FieldAccess, Identifier
-from rewrite.utils import random_id
+from ._markers import mark_deprecated
 
 _LangChain1 = [
     *Python,
@@ -80,15 +79,6 @@ def _get_import_names(multi: MultiImport) -> List[str]:
     return names
 
 
-def _mark_deprecated(tree: Any, message: str) -> Any:
-    """Add a SearchResult marker for a deprecation warning."""
-    search_marker = SearchResult(random_id(), message)
-    current_markers = tree.markers
-    new_markers_list = list(current_markers.markers) + [search_marker]
-    new_markers = Markers(current_markers.id, new_markers_list)
-    return tree.replace(_markers=new_markers)
-
-
 @categorize(_LangChain1)
 class ReplaceLangchainClassicImports(Recipe):
     """
@@ -228,7 +218,7 @@ class FindDeprecatedLangchainAgents(Recipe):
 
                 if found_deprecated:
                     names_str = ", ".join(found_deprecated)
-                    return _mark_deprecated(
+                    return mark_deprecated(
                         multi,
                         f"Deprecated LangChain API: {names_str} "
                         f"(use create_agent / LangGraph in v1.0)",
@@ -300,7 +290,7 @@ class FindLangchainCreateReactAgent(Recipe):
                 if "create_react_agent" not in imported_names:
                     return multi
 
-                return _mark_deprecated(
+                return mark_deprecated(
                     multi,
                     "Migrate to `from langchain.agents import create_agent` (LangChain v1.0)",
                 )