From de6892a3cc04bdefb2376a912af9685d88432fd9 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <pablogsal@gmail.com>
Date: Mon, 11 May 2020 00:18:30 +0100
Subject: [PATCH 1/4] bpo-40585: Normalize errors messages in codeop when
 comparing them

With the new parser, the error message contains always the trailing
newlines, causing the naive comparison of the repr of the error messages
in codeop to fail.
---
 Lib/codeop.py                                            | 5 ++++-
 Lib/test/test_codeop.py                                  | 9 +++++++++
 .../2020-05-11-00-19-42.bpo-40585.yusknY.rst             | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Core and Builtins/2020-05-11-00-19-42.bpo-40585.yusknY.rst

diff --git a/Lib/codeop.py b/Lib/codeop.py
index 082285f94fe847..5cd6b66f18a0db 100644
--- a/Lib/codeop.py
+++ b/Lib/codeop.py
@@ -93,10 +93,13 @@ 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 repr(err1) == repr(err2):
+        if not code1 and normalize_error(err1) == normalize_error(err2):
             raise err1
     finally:
         err1 = err2 = None
diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 1f27830ae50b84..0c5e362feea0ca 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -288,6 +288,15 @@ def test_invalid(self):
 
         ai("[i for i in range(10)] = (1, 2, 3)")
 
+    def test_invalid_exec(self):
+        ai = self.assertInvalid
+        ai("raise = 4", symbol="exec")
+        ai('def a-b', symbol='exec')
+        ai('await?', symbol='exec')
+        ai('=!=', symbol='exec')
+        ai('a await raise b', symbol='exec')
+        ai('a await raise b?+1', symbol='exec')
+
     def test_filename(self):
         self.assertEqual(compile_command("a = 1\n", "abc").co_filename,
                          compile("a = 1\n", "abc", 'single').co_filename)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-05-11-00-19-42.bpo-40585.yusknY.rst b/Misc/NEWS.d/next/Core and Builtins/2020-05-11-00-19-42.bpo-40585.yusknY.rst
new file mode 100644
index 00000000000000..7a9258ef0a938b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-05-11-00-19-42.bpo-40585.yusknY.rst	
@@ -0,0 +1,2 @@
+Fixed a bug when using :func:`codeop.compile_command` that was causing
+exceptions to be swallowed with the new parser. Patch by Pablo Galindo

From 5990c710d78a85203af68740868da64d27032445 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <pablogsal@gmail.com>
Date: Mon, 11 May 2020 00:42:09 +0100
Subject: [PATCH 2/4] fixup! bpo-40585: Normalize errors messages in codeop
 when comparing them

---
 Lib/codeop.py        | 5 +----
 Parser/pegen/pegen.c | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/codeop.py b/Lib/codeop.py
index 5cd6b66f18a0db..082285f94fe847 100644
--- 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
index 06af53b3597f74..800e44cbfd3418 100644
--- 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");

From 066daa19d11b160fa85d619ecfaede133fa3aae3 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <pablogsal@gmail.com>
Date: Mon, 11 May 2020 01:09:21 +0100
Subject: [PATCH 3/4] fixup! fixup! bpo-40585: Normalize errors messages in
 codeop when comparing them

---
 Parser/pegen/pegen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index 800e44cbfd3418..ba4d6a1cf15bec 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -310,12 +310,12 @@ get_error_line(char *buffer, int is_file)
         newline = strchr(buffer, '\n');
     }
 
-    while (newline && *newline == '\n') {
-        newline -= 1;
+    while (is_file && newline > buffer && newline[-1] == '\n') {
+        --newline;
     }
 
     if (newline) {
-        return PyUnicode_DecodeUTF8(buffer, newline - buffer + 1, "replace");
+        return PyUnicode_DecodeUTF8(buffer, newline - buffer, "replace");
     }
     else {
         return PyUnicode_DecodeUTF8(buffer, strlen(buffer), "replace");

From 97d320a9d8927d9a1d6070f66951336c1c9e0058 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <pablogsal@gmail.com>
Date: Mon, 11 May 2020 01:19:59 +0100
Subject: [PATCH 4/4] fixup! fixup! fixup! bpo-40585: Normalize errors messages
 in codeop when comparing them

---
 Parser/pegen/pegen.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index ba4d6a1cf15bec..c80f08668b07d6 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -310,8 +310,10 @@ get_error_line(char *buffer, int is_file)
         newline = strchr(buffer, '\n');
     }
 
-    while (is_file && newline > buffer && newline[-1] == '\n') {
-        --newline;
+    if (is_file) {
+        while (newline > buffer && newline[-1] == '\n') {
+            --newline;
+        }
     }
 
     if (newline) {