http://hg.python.org/cpython/rev/2b6802d8bee1 changeset: 88064:2b6802d8bee1 parent: 88063:f9b6c8ef55b6 parent: 88061:07331638ac85 user: Victor Stinner <victor.stinner at gmail.com> date: Thu Dec 19 16:41:22 2013 +0100 summary: Merge heads files: Objects/abstract.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2073,7 +2073,8 @@ "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; } -- Repository URL: http://hg.python.org/cpython