fixup! bpo-40585: Normalize errors messages in codeop when comparing …

…them
python · pablogsal · May 11, 2020 · May 10, 2020 · May 10, 2020 · May 11, 2020
commit 5990c710d78a85203af68740868da64d27032445
diff --git a/Lib/codeop.py b/Lib/codeop.py
@@ -93,13 +93,10 @@ def _maybe_compile(compiler, source, filename, symbol):
    except SyntaxError as e:
        err2 = e

-    def normalize_error(err):
-        return repr(err).replace("\\n", "")
-
    try:
        if code:
            return code
-        if not code1 and normalize_error(err1) == normalize_error(err2):
+        if not code1 and repr(err1) == repr(err2):
            raise err1
    finally:
        err1 = err2 = None

diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
@@ -310,8 +310,12 @@ get_error_line(char *buffer, int is_file)
        newline = strchr(buffer, '\n');
    }

+    while (newline && *newline == '\n') {
+        newline -= 1;
+    }
+
    if (newline) {
-        return PyUnicode_DecodeUTF8(buffer, newline - buffer, "replace");
+        return PyUnicode_DecodeUTF8(buffer, newline - buffer + 1, "replace");
    }
    else {
        return PyUnicode_DecodeUTF8(buffer, strlen(buffer), "replace");