Skip to content

bpo-35212: fix col_offset in f-strings #19398

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
matanagasauce wants to merge 3 commits into from
Closed

bpo-35212: fix col_offset in f-strings #19398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8540465
bpo-35212: fix col_offset in f-strings
matanagasauce Apr 6, 2020
0b1cba0
make test_fstring accord with fixed col_offsets
matanagasauce Apr 7, 2020
6c3dce2
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 7, 2020
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
15 changes: 15 additions & 0 deletions Lib/test/test_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,21 @@ def test_issue39579_dotted_name_end_col_offset(self):
attr_b = tree.body[0].decorator_list[0].value
self.assertEqual(attr_b.end_col_offset, 4)

def test_issue35212_fstring_col_offset(self):
tree = ast.parse(dedent('''
(
f"""Some multi-line text.
{a:b}
It goes on..."""
)
''').strip())
fstr = tree.body[0].value
value = fstr.values[1].value
self.assertEqual(value.col_offset, 9)
self.assertEqual(value.lineno, 3)
self.assertEqual(value.end_col_offset, 10)
self.assertEqual(value.end_lineno, 3)

def test_ast_asdl_signature(self):
self.assertEqual(ast.withitem.__doc__, "withitem(expr context_expr, expr? optional_vars)")
self.assertEqual(ast.GtE.__doc__, "GtE")
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_fstring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ def test_ast_line_numbers_multiline_fstring(self):
self.assertEqual(binop.lineno, 4)
self.assertEqual(binop.left.lineno, 4)
self.assertEqual(binop.right.lineno, 6)
self.assertEqual(binop.col_offset, 4)
self.assertEqual(binop.left.col_offset, 4)
self.assertEqual(binop.col_offset, 3)
self.assertEqual(binop.left.col_offset, 3)
self.assertEqual(binop.right.col_offset, 7)

def test_docstring(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-04-07-06-00-20.bpo-35212.86avLy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix col_offset in f-strings
10 changes: 8 additions & 2 deletions Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4695,8 +4695,12 @@ fstring_fix_node_location(const node *parent, node *n, char *expr_str)
if (substr) {
start = substr;
while (start > parent->n_str) {
if (start[0] == '\n')
if (start[0] == '\n') {
/* when the f-string expression is on a new line, clear
old offset and also don't count the `\n` */
cols = -1;
break;
}
start--;
}
cols += (int)(substr - start);
Expand Down Expand Up @@ -4770,7 +4774,9 @@ fstring_compile_expr(const char *expr_start, const char *expr_end,
}
/* Reuse str to find the correct column offset. */
str[0] = '{';
str[len+1] = '}';
/* bpo-35212: if the fstring has a format_spec, it doesn't match a close
brace. */
str[len+1] = 0;
fstring_fix_node_location(n, mod_n, str);
mod = PyAST_FromNode(mod_n, &cf, "<fstring>", c->c_arena);
PyMem_RawFree(str);
Expand Down