mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #25677: Merge SyntaxError caret positioning from 3.6

Browse source
This commit is contained in:
Martin Panter 2016-12-19 06:46:12 +00:00
commit b46edf35f3
5 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/errors.c
View file

@ -1138,11 +1138,8 @@ err_programtext(FILE *fp, int lineno)
}
fclose(fp);
if (i == lineno) {
char *p = linebuf;
PyObject *res;
while (*p == ' ' || *p == '\t' || *p == '\014')
p++;
res = PyUnicode_FromString(p);
res = PyUnicode_FromString(linebuf);
if (res == NULL)
PyErr_Clear();
return res;

2
Python/pythonrun.c
View file

@ -528,7 +528,7 @@ print_error_text(PyObject *f, int offset, PyObject *text_obj)
offset -= (int)(nl+1-text);
text = nl+1;
}
while (*text == ' ' || *text == '\t') {
while (*text == ' ' || *text == '\t' || *text == '\f') {
text++;
offset--;
}