remove broken code accounting an offset the size of the line #10186

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 11bdf58090a380e7ecae452ba8a5b07ea7aa9a65..e4ae4abcc9ac14797c5fafd0aa3d32f69ec650fb 100644 (file)
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -289,6 +289,12 @@ class BaseExceptionReportingTests:
         self.assertIn('inner_raise() # Marker', blocks[2])
         self.check_zero_div(blocks[2])
 
+    def test_syntax_error_offset_at_eol(self):
+        # See #10186.
+        def e():
+            raise SyntaxError('', ('', 0, 5, 'hello'))
+        msg = self.get_report(e).splitlines()
+        self.assertEqual(msg[-2], "        ^")
 
 
 class PyExcReportingTests(BaseExceptionReportingTests, unittest.TestCase):

diff --git a/Misc/NEWS b/Misc/NEWS
index 4c7dc4b5fab2f5cdf7a962ed9779676f8a48005b..98bc24f1cc6047890282b5836345243f94681fbe 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1?
 Core and Builtins
 -----------------
 
+- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length
+  of the offending line.
+
 - Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error
   handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source
   code directory name contains a non-ASCII character and the locale encoding is

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f755d117fffe6f9575613aae04dbbafe634c3492..cf8f7bf2a7670dd30ff4d67f77a7a6e9124be028 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1344,8 +1344,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)