Merged revisions 85904 via svnmerge from

benjamin.peterson · benjamin.peterson · commit 1c54dadb8588 · 2010-10-29T03:45:34.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85904 | benjamin.peterson | 2010-10-28 22:28:14 -0500 (Thu, 28 Oct 2010) | 1 line decrement offset when it points to a newline (#10186 followup) ........ git-svn-id: http://svn.python.org/projects/python/branches/release27-maint@85905 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1045,6 +1045,8 @@ print_error_text(PyObject *f, int offset, const char *text)
 {
     char *nl;
     if (offset >= 0) {
+        if (offset > 0 && offset == strlen(text) && text[offset - 1] == '\n')
+            offset--;
         for (;;) {
             nl = strchr(text, '\n');
             if (nl == NULL || nl-text >= offset)

Original file line number	Diff line number	Diff line change
`@@ -1045,6 +1045,8 @@ print_error_text(PyObject f, int offset, const char text)`
`1045`	`1045`	`{`
`1046`	`1046`	`char *nl;`
`1047`	`1047`	`if (offset >= 0) {`
	`1048`	`+ if (offset > 0 && offset == strlen(text) && text[offset - 1] == '\n')`
	`1049`	`+ offset--;`
`1048`	`1050`	`for (;;) {`
`1049`	`1051`	`nl = strchr(text, '\n');`
`1050`	`1052`	`if (nl == NULL \|\| nl-text >= offset)`