Skip to content

Fix f-string debug format parsing for Python 3.8+ ({expr=}) #118

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

Open
aryanyk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix f-string debug format parsing for Python 3.8+ ({expr=}) #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions pasta/base/annotate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,10 +1265,13 @@ def check_slice_includes_step(self, node):
@fstring_expression
def visit_FormattedValue(self, node):
self.visit(node.value)
self.optional_token(node, 'debug_specifier', '=')
if node.conversion != -1:
self.attr(node, 'conversion',
[self.ws, '!', chr(node.conversion)], deps=('conversion',),
default='!%c' % node.conversion)
self.optional_token(node, 'conversion_prefix', '!')
if fmt.get(node, 'conversion_prefix'):
self.attr(node, 'conversion_char',
[chr(node.conversion)], deps=('conversion',),
default='%c' % node.conversion)
if node.format_spec:
self.attr(node, 'format_spec_prefix', [self.ws, ':', self.ws],
default=':')
Expand Down
12 changes: 12 additions & 0 deletions pasta/base/annotate_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,18 @@ def test_fstring_escaping(self):
fmt.get(node, 'content'),
'f"a {{{__pasta_fstring_val_0__} {{c}}"')

@test_utils.requires_features('fstring')
def test_fstring_debug_format(self):
src = 'f"{a=}"'
self.assertEqual(src, pasta.dump(pasta.parse(src)))
src = 'f"{a=!r}"'
self.assertEqual(src, pasta.dump(pasta.parse(src)))
src = 'f"{a=:d}"'
self.assertEqual(src, pasta.dump(pasta.parse(src)))
src = 'f"{a=!r:10}"'
self.assertEqual(src, pasta.dump(pasta.parse(src)))
src = 'f"prefix {x=} suffix"'
self.assertEqual(src, pasta.dump(pasta.parse(src)))


class VersionSupportTest(test_utils.TestCase):
Expand Down