openrewrite-migrate-python 0.16.0.dev20260925124012__tar.gz → 0.16.0.dev20260926165430__tar.gz

{openrewrite_migrate_python-0.16.0.dev20260925124012 → openrewrite_migrate_python-0.16.0.dev20260926165430}/PKG-INFO

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

{openrewrite_migrate_python-0.16.0.dev20260925124012 → openrewrite_migrate_python-0.16.0.dev20260926165430}/src/openrewrite_migrate_python/migrate/string_formatting.py

@@ -21,10 +21,9 @@ from rewrite.markers import Markers
 from rewrite.python.visitor import PythonVisitor
 from rewrite.java.support_types import JRightPadded, Space
 from rewrite.java.tree import Binary, Expression, FieldAccess, Identifier, J, Literal, MethodInvocation, Parentheses
+from rewrite.python.printer import PrintOutputCapture, PythonPrinter
 from rewrite.python.tree import (
     CollectionLiteral,
-    ComprehensionExpression,
-    DictLiteral,
     FormattedString,
     NamedArgument,
     Star,
@@ -74,17 +73,6 @@ def _get_fstring_delimiter(value_source: str) -> Optional[str]:
     return 'f' + quote if quote else None
 
 
-def _opens_with_brace(expr: Any) -> bool:
-    """Whether ``expr`` prints with a leading ``{`` that the field's own brace makes into ``{{``."""
-    if isinstance(expr, DictLiteral):
-        return True
-    if isinstance(expr, CollectionLiteral):
-        return expr.kind == CollectionLiteral.Kind.SET
-    if isinstance(expr, ComprehensionExpression):
-        return expr.kind in (ComprehensionExpression.Kind.SET, ComprehensionExpression.Kind.DICT)
-    return False
-
-
 def _breaks_replacement_field(expr: Any, quote: str) -> bool:
     """Whether ``expr`` holds anything a replacement field cannot carry.
 
@@ -124,11 +112,11 @@ def _unsafe_to_interpolate(expr: Any, delimiter: str) -> bool:
     """Whether substituting ``expr`` into a replacement field spoils the f-string.
 
     A literal argument nests a string in a string, a rewrite worth declining however it
-    is quoted. Deeper literals are declined only where 3.8 -- the earliest target these
-    recipes run for -- cannot parse the result.
+    is quoted. Other expressions are declined only where 3.8 -- the earliest target
+    these recipes run for -- cannot parse the result.
     """
     value = expr.value if isinstance(expr, NamedArgument) else expr
-    if _opens_with_brace(value) or _is_string_literal(value):
+    if _is_string_literal(value):
         return True
     return _breaks_replacement_field(value, delimiter[1:])
 
@@ -151,6 +139,23 @@ def _has_backslash(value_source: str) -> bool:
     return '\\' in content
 
 
+def _field_expression(arg_expr: Expression, delimiter: str) -> Optional[JRightPadded]:
+    """The argument as a replacement field, or None when it cannot sit inside this f-string."""
+    expr = arg_expr.replace(_prefix=Space.EMPTY)
+    source = PythonPrinter().print(expr, PrintOutputCapture(None))
+    # Only legal in a replacement field from 3.12 (PEP 701)
+    if any(c in source for c in (delimiter[1], '\\', '#', '\n')):
+        return None
+    # A leading or trailing brace would fuse with the field's own and read as an escaped brace
+    if source.startswith('{'):
+        expr = expr.replace(_prefix=Space.SINGLE_SPACE)
+    return JRightPadded(
+        _element=expr,
+        _after=Space.SINGLE_SPACE if source.endswith('}') else Space.EMPTY,
+        _markers=Markers.EMPTY,
+    )
+
+
 def _convert_format_to_fstring(method: MethodInvocation) -> Optional[FormattedString]:
     """Convert a ``"...".format(...)`` MethodInvocation to a FormattedString.
 
@@ -267,11 +272,9 @@ def _convert_format_to_fstring(method: MethodInvocation) -> Optional[FormattedSt
                     return None
                 arg_expr = named_args[field_name]
 
-            padded_expr = JRightPadded(
-                _element=arg_expr.replace(_prefix=Space.EMPTY),
-                _after=Space.EMPTY,
-                _markers=Markers.EMPTY,
-            )
+            padded_expr = _field_expression(arg_expr, delimiter)
+            if padded_expr is None:
+                return None
 
             # Map conversion flag
             conversion_enum = None
@@ -498,11 +501,9 @@ def _convert_percent_to_fstring(binary: Binary) -> Optional[FormattedString]:
             arg_expr = args[arg_index]
             arg_index += 1
 
-            padded_expr = JRightPadded(
-                _element=arg_expr.replace(_prefix=Space.EMPTY),
-                _after=Space.EMPTY,
-                _markers=Markers.EMPTY,
-            )
+            padded_expr = _field_expression(arg_expr, delimiter)
+            if padded_expr is None:
+                return None
 
             conversion_enum = None
             if part_value == 'r':

{openrewrite_migrate_python-0.16.0.dev20260925124012 → openrewrite_migrate_python-0.16.0.dev20260926165430}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.16.0.dev20260925124012
+Version: 0.16.0.dev20260926165430
 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.16.0.dev20260925124012 → openrewrite_migrate_python-0.16.0.dev20260926165430}/tests/test_string_formatting.py

@@ -249,6 +249,31 @@ class TestReplaceStrFormatWithFString:
             )
         )
 
+    def test_set_literal_argument_is_spaced_from_the_field_braces(self):
+        """A brace of the argument's own must not fuse with the field's into an escaped brace."""
+        spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())
+        spec.rewrite_run(
+            python(
+                """
+                message = "{} outside {} block".format(op, {'for', 'while'})
+                """,
+                """
+                message = f"{op} outside { {'for', 'while'} } block"
+                """,
+            )
+        )
+
+    def test_no_change_argument_contains_the_delimiter_quote(self):
+        """The quote is only legal inside a replacement field from 3.12."""
+        spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())
+        spec.rewrite_run(
+            python(
+                """
+                message = "{} outside {} block".format(op, {"for", "while"})
+                """,
+            )
+        )
+
     def test_no_change_backslash_in_string(self):
         """'hello\\n{}'.format(name) — backslash escape, no change."""
         spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())
@@ -326,19 +351,6 @@ class TestReplaceStrFormatWithFString:
             )
         )
 
-    def test_no_change_brace_opening_argument(self):
-        """A brace-opening argument's own brace would read as an escaped `{{`."""
-        spec = RecipeSpec(recipe=ReplaceStrFormatWithFString())
-        spec.rewrite_run(
-            python(
-                """
-                keywords = "{}".format({1, 2})
-                mapping = "{}".format({1: 2})
-                squares = "{}".format({n: n * n for n in sizes})
-                """
-            )
-        )
-
     def test_idempotent(self):
         """Running the recipe twice produces the same result."""
         recipe = ReplaceStrFormatWithFString()
@@ -485,6 +497,29 @@ class TestReplacePercentFormatWithFString:
             )
         )
 
+    def test_dict_literal_argument_is_spaced_from_the_field_braces(self):
+        spec = RecipeSpec(recipe=ReplacePercentFormatWithFString())
+        spec.rewrite_run(
+            python(
+                """
+                message = "config: %s" % ({'a': 1},)
+                """,
+                """
+                message = f"config: { {'a': 1} }"
+                """,
+            )
+        )
+
+    def test_no_change_argument_contains_the_delimiter_quote(self):
+        spec = RecipeSpec(recipe=ReplacePercentFormatWithFString())
+        spec.rewrite_run(
+            python(
+                """
+                message = "name: %s" % d["name"]
+                """,
+            )
+        )
+
     def test_no_change_backslash(self):
         r"""'%s\n' % x — backslash in string, no change."""
         spec = RecipeSpec(recipe=ReplacePercentFormatWithFString())