From 59c900d3bf85965efe7edc1a3bb7e9b49512f6ab Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 7 Oct 2013 20:38:51 +0200
Subject: Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in
 at least one place so as to avoid regressions.

---
 Python/ceval.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Python')

diff --git a/Python/ceval.c b/Python/ceval.c
index d28ae2ba05..faee5cd44d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2083,7 +2083,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             }
             else {
                 x = PyObject_GetItem(v, w);
-                if (x == NULL && PyErr_Occurred()) {
+                if (x == NULL && _PyErr_OCCURRED()) {
                     if (!PyErr_ExceptionMatches(
                                     PyExc_KeyError))
                         break;
@@ -2127,7 +2127,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                                        (PyDictObject *)f->f_builtins,
                                        w);
                 if (x == NULL) {
-                    if (!PyErr_Occurred())
+                    if (!_PyErr_OCCURRED())
                         format_exc_check_arg(PyExc_NameError,
                                              GLOBAL_NAME_ERROR_MSG, w);
                     break;
-- 
cgit v1.2.1