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

a5618620 · Serhiy Storchaka · GitHub · 73a7e9b1 · a5618620
Commit a5618620 authored Dec 01, 2017 by Serhiy Storchaka Committed by GitHub Dec 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

Python/ast.c Python/ast.c +10 -9

No files found.
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -4160,18 +4160,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 &&
+                                   NULL, NULL) < 0)
-        PyErr_ExceptionMatches(PyExc_DeprecationWarning))
    {
-        const char *s;
+        if (PyErr_ExceptionMatches(PyExc_DeprecationWarning)) {
+            const char *s;
-        /* Replace the DeprecationWarning exception with a SyntaxError
+            /* Replace the DeprecationWarning exception with a SyntaxError
-           to get a more accurate error report */
+               to get a more accurate error report */
-        PyErr_Clear();
+            PyErr_Clear();
-        s = PyUnicode_AsUTF8(msg);
+            s = PyUnicode_AsUTF8(msg);
-        if (s != NULL) {
+            if (s != NULL) {
-            ast_error(c, n, s);
+                ast_error(c, n, s);
+            }
        }
        Py_DECREF(msg);
        return -1;