#2816: clarify error messages for EOF while scanning strings.

georg.brandl · georg.brandl · commit 698aeab558b2 · 2008-05-11T15:07:39.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@63068 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_eof.py b/Lib/test/test_eof.py
@@ -6,7 +6,7 @@
 
 class EOFTestCase(unittest.TestCase):
     def test_EOFC(self):
-        expect = "EOL while scanning single-quoted string (<string>, line 1)"
+        expect = "EOL while scanning string literal (<string>, line 1)"
         try:
             eval("""'this is a test\
             """)
@@ -16,7 +16,8 @@ def test_EOFC(self):
             raise test_support.TestFailed
 
     def test_EOFS(self):
-        expect = "EOF while scanning triple-quoted string (<string>, line 1)"
+        expect = ("EOF while scanning triple-quoted string literal "
+                  "(<string>, line 1)")
         try:
             eval("""'''this is a test""")
         except SyntaxError, msg:
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1500,10 +1500,10 @@ err_input(perrdetail *err)
 		msg = "invalid token";
 		break;
 	case E_EOFS:
-		msg = "EOF while scanning triple-quoted string";
+		msg = "EOF while scanning triple-quoted string literal";
 		break;
 	case E_EOLS:
-		msg = "EOL while scanning single-quoted string";
+		msg = "EOL while scanning string literal";
 		break;
 	case E_INTR:
 		if (!PyErr_Occurred())
