Skip to content

bpo-37003: handle f-debug in ast-unparse, #13475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Carreau wants to merge 2 commits into from
Closed

bpo-37003: handle f-debug in ast-unparse, #13475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e2fdc
bpo-37003: handle f-debug in ast-unparse,
May 21, 2019
2a8d2ac
handle more cases
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Lib/test/test_tools/test_unparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,14 @@ def test_fstrings(self):
self.check_roundtrip(r"""f'{f"{0}"*3}'""")
self.check_roundtrip(r"""f'{f"{y}"*3}'""")

def test_fstrings_debug(self):
self.check_roundtrip(r"""f'{f.a.b()=}'""")
self.check_roundtrip(r"""f'{f.a.b()=!s:20}'""")
self.check_roundtrip(r"""f'{f.a.b()=!r}'""")
self.check_roundtrip(r"""f'{f.a.b() = !r}'""")
self.check_roundtrip(r"""f'*{n=:+<30}*'""")
self.check_roundtrip(r"""f'{x=:.2f}'""")

def test_del_statement(self):
self.check_roundtrip("del x, y, z")

Expand Down
15 changes: 9 additions & 6 deletions Tools/parser/unparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,12 +360,15 @@ def _fstring_Constant(self, t, write):

def _fstring_FormattedValue(self, t, write):
write("{")
expr = io.StringIO()
Unparser(t.value, expr)
expr = expr.getvalue().rstrip("\n")
if expr.startswith("{"):
write(" ") # Separate pair of opening brackets as "{ {"
write(expr)
if t.expr_text:
write(t.expr_text)
else:
expr = io.StringIO()
Unparser(t.value, expr)
expr = expr.getvalue().rstrip("\n")
if expr.startswith("{"):
write(" ") # Separate pair of opening brackets as "{ {"
write(expr)
if t.conversion != -1:
conversion = chr(t.conversion)
assert conversion in "sra"
Expand Down