diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-07 18:38:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-07 18:38:51 (GMT) |
| commit | 59c900d3bf85965efe7edc1a3bb7e9b49512f6ab (patch) | |
| tree | c35182a257ea7756a27e7b67c6b26ee55c7daf3e /Python/ceval.c | |
| parent | c377fe2b968f8e1a5f276063a41cd4df75d4af2f (diff) | |
| download | cpython-59c900d3bf85965efe7edc1a3bb7e9b49512f6ab.zip cpython-59c900d3bf85965efe7edc1a3bb7e9b49512f6ab.tar.gz cpython-59c900d3bf85965efe7edc1a3bb7e9b49512f6ab.tar.bz2 | |
Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at least one place so as to avoid regressions.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index d28ae2b..faee5cd 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; |