From: Benjamin Peterson Date: Sun, 24 Oct 2010 03:00:35 +0000 (+0000) Subject: Merged revisions 85814 via svnmerge from X-Git-Tag: v2.7.1rc1~116 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f99f33da605ba1d589029880d922a132a362618b;p=python Merged revisions 85814 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85814 | benjamin.peterson | 2010-10-23 21:52:05 -0500 (Sat, 23 Oct 2010) | 1 line remove broken code accounting an offset the size of the line #10186 ........ --- diff --git a/Misc/NEWS b/Misc/NEWS index d25e25ec2f..41d90d0f96 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Core and Builtins - Issue #10125: Don't segfault when the iterator passed to ``file.writelines()`` closes the file. +- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length + of the offending line. + - Issue #9997: Don't let the name "top" have special significance in scope resolution. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 7f63ae108c..f3b4e5044e 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1045,8 +1045,6 @@ print_error_text(PyObject *f, int offset, const char *text) { char *nl; if (offset >= 0) { - if (offset > 0 && offset == (int)strlen(text)) - offset--; for (;;) { nl = strchr(text, '\n'); if (nl == NULL || nl-text >= offset)