(original) (raw)

changeset: 84573:d9446c2a2fd4 user: Victor Stinner victor.stinner@gmail.com date: Fri Jul 12 00:11:58 2013 +0200 files: Python/ceval.c description: Issue #18408: ceval.c: in debug mode, convert the PyErr_Occurred() check on exception (when getting NULL) to an assertion to detect bugs earlier diff -r 1eac89af9acf -r d9446c2a2fd4 Python/ceval.c --- a/Python/ceval.c Fri Jul 12 00:08:59 2013 +0200 +++ b/Python/ceval.c Fri Jul 12 00:11:58 2013 +0200 @@ -3026,9 +3026,13 @@ why = WHY_EXCEPTION; /* Double-check exception status. */ +#ifdef NDEBUG if (!PyErr_Occurred()) PyErr_SetString(PyExc_SystemError, "error return without exception set"); +#else + assert(PyErr_Occurred()); +#endif /* Log traceback info. */ PyTraceBack_Here(f); /victor.stinner@gmail.com