Merge heads

This commit is contained in:
Victor Stinner 2013-12-19 16:41:22 +01:00
commit c234f185cb

View file

@ -2073,7 +2073,8 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw)
"NULL result without error in PyObject_Call");
}
#else
assert(result != NULL || PyErr_Occurred());
assert((result != NULL && !PyErr_Occurred())
|| (result == NULL && PyErr_Occurred()));
#endif
return result;
}