From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 1 Dec 2017 07:21:45 +0000 (-0800)
Subject: Don't hide unexpected errors in PyErr_WarnExplicitObject(). (GH-4585) (#4662)
X-Git-Tag: v3.6.4rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9881e4e5386bf6a74b4a542321c23a7c396035ef;p=python

Don't hide unexpected errors in PyErr_WarnExplicitObject(). (GH-4585) (#4662)

(cherry picked from commit a561862048555d555fa4850eaf832ae5474c7e1f)
---

diff --git a/Python/ast.c b/Python/ast.c
index d2710259ac..ede7f4fd99 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -4136,18 +4136,19 @@ warn_invalid_escape_sequence(struct compiling *c, const node *n,
     }
     if (PyErr_WarnExplicitObject(PyExc_DeprecationWarning, msg,
                                    c->c_filename, LINENO(n),
-                                   NULL, NULL) < 0 &&
-        PyErr_ExceptionMatches(PyExc_DeprecationWarning))
+                                   NULL, NULL) < 0)
     {
-        const char *s;
+        if (PyErr_ExceptionMatches(PyExc_DeprecationWarning)) {
+            const char *s;
 
-        /* Replace the DeprecationWarning exception with a SyntaxError
-           to get a more accurate error report */
-        PyErr_Clear();
+            /* Replace the DeprecationWarning exception with a SyntaxError
+               to get a more accurate error report */
+            PyErr_Clear();
 
-        s = PyUnicode_AsUTF8(msg);
-        if (s != NULL) {
-            ast_error(c, n, s);
+            s = PyUnicode_AsUTF8(msg);
+            if (s != NULL) {
+                ast_error(c, n, s);
+            }
         }
         Py_DECREF(msg);
         return -1;