Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit390a5b8

Browse files
[3.11]gh-112387: Fix error positions for decoded strings with backwards tokenize errors (GH-112409) (#112469)
gh-112387: Fix error positions for decoded strings with backwards tokenize errors (GH-112409)(cherry picked from commit45d6485)Signed-off-by: Pablo Galindo <pablogsal@gmail.com>Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
1 parent43b081b commit390a5b8

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

‎Lib/test/test_syntax.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,6 +2143,10 @@ def test_error_parenthesis(self):
21432143
"""
21442144
self._check_error(code,"parenthesis '\\)' does not match opening parenthesis '\\['")
21452145

2146+
# Examples with dencodings
2147+
s=b'# coding=latin\n(aaaaaaaaaaaaaaaaa\naaaaaaaaaaa\xb5'
2148+
self._check_error(s,"'\(' was never closed")
2149+
21462150
deftest_error_string_literal(self):
21472151

21482152
self._check_error("'blech","unterminated string literal")
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix error positions for decoded strings with backwards tokenize errors.
2+
Patch by Pablo Galindo

‎Parser/pegen_errors.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
270270
Py_ssize_trelative_lineno=p->starting_lineno ?lineno-p->starting_lineno+1 :lineno;
271271
constchar*buf_end=p->tok->fp_interactive ?p->tok->interactive_src_end :p->tok->inp;
272272

273+
if (buf_end<cur_line) {
274+
buf_end=cur_line+strlen(cur_line);
275+
}
276+
273277
for (inti=0;i<relative_lineno-1;i++) {
274278
char*new_line=strchr(cur_line,'\n');
275279
// The assert is here for debug builds but the conditional that

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp