From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 8 Jun 2021 00:36:19 +0000 (-0700)
Subject: fix: use unambiguous punction in 'invalid escape sequence' message (GH-26582)
X-Git-Tag: v3.10.0b3~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d80f4265db63a1692455abb8d1c77d0d72151bbb;p=thirdparty%2FPython%2Fcpython.git

fix: use unambiguous punction in 'invalid escape sequence' message (GH-26582)

(cherry picked from commit ffd87b7093109c279caf8e3ca060f408a102388a)

Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
---

diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index af29c171d428..6ffec918ebbd 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -651,7 +651,7 @@ class CmdLineTest(unittest.TestCase):
                 stderr.splitlines()[-3:],
                 [   b'    foo = """\\q"""',
                     b'          ^^^^^^^^',
-                    b'SyntaxError: invalid escape sequence \\q'
+                    b'SyntaxError: invalid escape sequence \'\\q\''
                 ],
             )
 
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index b919633ded8d..fa41a360c3fb 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -12,7 +12,7 @@ static int
 warn_invalid_escape_sequence(Parser *p, unsigned char first_invalid_escape_char, Token *t)
 {
     PyObject *msg =
-        PyUnicode_FromFormat("invalid escape sequence \\%c", first_invalid_escape_char);
+        PyUnicode_FromFormat("invalid escape sequence '\\%c'", first_invalid_escape_char);
     if (msg == NULL) {
         return -1;
     }
@@ -27,7 +27,7 @@ warn_invalid_escape_sequence(Parser *p, unsigned char first_invalid_escape_char,
                since _PyPegen_raise_error uses p->tokens[p->fill - 1] for the
                error location, if p->known_err_token is not set. */
             p->known_err_token = t;
-            RAISE_SYNTAX_ERROR("invalid escape sequence \\%c", first_invalid_escape_char);
+            RAISE_SYNTAX_ERROR("invalid escape sequence '\\%c'", first_invalid_escape_char);
         }
         Py_DECREF(msg);
         return -1;