Commit45d6485

authored

gh-112387: Fix error positions for decoded strings with backwards tokenize errors (#112409)

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>

1 parent2c8b191 commit45d6485Copy full SHA for 45d6485

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2334,6 +2334,10 @@ def test_error_parenthesis(self):`
`2334`	`2334`	`"""`
`2335`	`2335`	`self._check_error(code,"parenthesis '\\)' does not match opening parenthesis '\\['")`
`2336`	`2336`
	`2337`	`+# Examples with dencodings`
	`2338`	`+s=b'# coding=latin\n(aaaaaaaaaaaaaaaaa\naaaaaaaaaaa\xb5'`
	`2339`	`+self._check_error(s,"'\(' was never closed")`
	`2340`	`+`
`2337`	`2341`	`deftest_error_string_literal(self):`
`2338`	`2342`
`2339`	`2343`	`self._check_error("'blech",r"unterminated string literal $.*$$")`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix error positions for decoded strings with backwards tokenize errors.`
	`2`	`+Patch by Pablo Galindo`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,10 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)`
`282`	`282`	`Py_ssize_trelative_lineno=p->starting_lineno ?lineno-p->starting_lineno+1 :lineno;`
`283`	`283`	`constchar*buf_end=p->tok->fp_interactive ?p->tok->interactive_src_end :p->tok->inp;`
`284`	`284`
	`285`	`+if (buf_end<cur_line) {`
	`286`	`+buf_end=cur_line+strlen(cur_line);`
	`287`	`+ }`
	`288`	`+`
`285`	`289`	`for (inti=0;i<relative_lineno-1;i++) {`
`286`	`290`	`char*new_line=strchr(cur_line,'\n');`
`287`	`291`	`// The assert is here for debug builds but the conditional that`

Comments

(0)