diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-10-24 03:00:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-10-24 03:00:35 (GMT) |
| commit | f99f33da605ba1d589029880d922a132a362618b (patch) | |
| tree | de02b4bae89ed3c8f3c56990a39299175a52abc7 | |
| parent | e395752bcc3f1dda1314c9d006b78ea32bfdb090 (diff) | |
| download | cpython-f99f33da605ba1d589029880d922a132a362618b.zip cpython-f99f33da605ba1d589029880d922a132a362618b.tar.gz cpython-f99f33da605ba1d589029880d922a132a362618b.tar.bz2 | |
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
........
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/pythonrun.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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 7f63ae1..f3b4e50 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) |