diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-12-19 15:41:22 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-12-19 15:41:22 (GMT) |
| commit | c234f185cb37e945f29a702ac5f7a149236f8c65 (patch) | |
| tree | b5a9e8d39237a5b1448161f5bb9e25989de2bb14 | |
| parent | 08263f10f8b9374cccf47591c3ccc64fb888d269 (diff) | |
| parent | 4ac9c00cff2218e56d0d7f6385c4a0fbf9bcd20f (diff) | |
| download | cpython-c234f185cb37e945f29a702ac5f7a149236f8c65.zip cpython-c234f185cb37e945f29a702ac5f7a149236f8c65.tar.gz cpython-c234f185cb37e945f29a702ac5f7a149236f8c65.tar.bz2 | |
Merge heads
| -rw-r--r-- | Objects/abstract.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index a9c6d6b..38ddb0f 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -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; } |