Skip to content

Add f-strings to label visitor #142

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.

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

Merged
merged 1 commit into from
Jul 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions pyt/helper_visitors/label_visitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,35 @@ def visit_Name(self, node):

def visit_Str(self, node):
self.result += "'" + node.s + "'"

def visit_joined_str(self, node, surround=True):
for val in node.values:
if isinstance(val, ast.Str):
self.result += val.s
else:
self.visit(val)

def visit_JoinedStr(self, node):
"""
JoinedStr(expr* values)
"""
self.result += "f\'"
self.visit_joined_str(node)
self.result += "'"

def visit_FormattedValue(self, node):
"""
FormattedValue(expr value, int? conversion, expr? format_spec)
"""
self.result += '{'
self.visit(node.value)
self.result += {
-1: '', # no formatting
97: '!a', # ascii formatting
114: '!r', # repr formatting
115: '!s', # string formatting
}[node.conversion]
if node.format_spec:
self.result += ':'
self.visit_joined_str(node.format_spec)
self.result += '}'
8 changes: 8 additions & 0 deletions tests/helper_visitors/label_visitor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,11 @@ def test_list_one_element(self):
def test_list_two_elements(self):
label = self.perform_labeling_on_expression('[1, 2]')
self.assertEqual(label.result, '[1, 2]')

def test_joined_str(self):
label = self.perform_labeling_on_expression('f"a{f(b)}{c}d"')
self.assertEqual(label.result, 'f\'a{f(b)}{c}d\'')

def test_joined_str_with_format_spec(self):
label = self.perform_labeling_on_expression('f"a{b!s:.{length}}"')
self.assertEqual(label.result, 'f\'a{b!s:.{length}}\'')