Skip to content

Commit

Permalink
pythongh-112364: Correct unparsing of backslashes and quotes in ast.u…
Browse files Browse the repository at this point in the history
…nparse (python#115696)
  • Loading branch information
15r10nk authored Feb 21, 2024
1 parent 074bbec commit 69ab930
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Lib/ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -1269,14 +1269,18 @@ def visit_JoinedStr(self, node):
quote_type = quote_types[0]
self.write(f"{quote_type}{value}{quote_type}")

def _write_fstring_inner(self, node, escape_newlines=False):
def _write_fstring_inner(self, node, is_format_spec=False):
if isinstance(node, JoinedStr):
# for both the f-string itself, and format_spec
for value in node.values:
self._write_fstring_inner(value, escape_newlines=escape_newlines)
self._write_fstring_inner(value, is_format_spec=is_format_spec)
elif isinstance(node, Constant) and isinstance(node.value, str):
value = node.value.replace("{", "{{").replace("}", "}}")
if escape_newlines:

if is_format_spec:
value = value.replace("\\", "\\\\")
value = value.replace("'", "\\'")
value = value.replace('"', '\\"')
value = value.replace("\n", "\\n")
self.write(value)
elif isinstance(node, FormattedValue):
Expand All @@ -1300,10 +1304,7 @@ def unparse_inner(inner):
self.write(f"!{chr(node.conversion)}")
if node.format_spec:
self.write(":")
self._write_fstring_inner(
node.format_spec,
escape_newlines=True
)
self._write_fstring_inner(node.format_spec, is_format_spec=True)

def visit_Name(self, node):
self.write(node.id)
Expand Down
15 changes: 15 additions & 0 deletions Lib/test/test_unparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,21 @@ def test_multiquote_joined_string(self):
self.check_ast_roundtrip("""f'''""\"''\\'{"\\n\\"'"}''' """)
self.check_ast_roundtrip("""f'''""\"''\\'{""\"\\n\\"'''""\" '''\\n'''}''' """)

def test_backslash_in_format_spec(self):
self.check_ast_roundtrip("""f"{x:\\ }" """)
self.check_ast_roundtrip("""f"{x:\\\\ }" """)
self.check_ast_roundtrip("""f"{x:\\\\\\ }" """)
self.check_ast_roundtrip("""f"{x:\\\\\\\\ }" """)

def test_quote_in_format_spec(self):
self.check_ast_roundtrip("""f"{x:'}" """)
self.check_ast_roundtrip("""f"{x:\\'}" """)
self.check_ast_roundtrip("""f"{x:\\\\'}" """)

self.check_ast_roundtrip("""f'\\'{x:"}' """)
self.check_ast_roundtrip("""f'\\'{x:\\"}' """)
self.check_ast_roundtrip("""f'\\'{x:\\\\"}' """)


class ManualASTCreationTestCase(unittest.TestCase):
"""Test that AST nodes created without a type_params field unparse correctly."""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed :func:`ast.unparse` to handle format_spec with ``"``, ``'`` or ``\\``. Patched by Frank Hoffmann.

0 comments on commit 69ab930

Please sign in to comment.