diff options
| author | Jay Bourque <jay.bourque@continuum.io> | 2013-08-05 14:16:12 -0500 |
|---|---|---|
| committer | Jay Bourque <jay.bourque@continuum.io> | 2013-08-16 16:39:33 -0500 |
| commit | 2ec4c94077bd3e5e01d993f82acd589ecac07b0f (patch) | |
| tree | 4a52b2a9de3bdf9a26517a37305a1218edc74da8 /numpy | |
| parent | a04bb37b9346ec8c2867ba09f8a76b6615d10200 (diff) | |
| download | numpy-2ec4c94077bd3e5e01d993f82acd589ecac07b0f.tar.gz | |
Check for python error when needs_api flag is set
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 982d10fbf..24c96eb7a 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -5134,7 +5134,12 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args) Py_XDECREF(array_operands[2]); Py_XDECREF(errobj); - Py_RETURN_NONE; + if (needs_api && PyErr_Occurred()) { + return NULL; + } + else { + Py_RETURN_NONE; + } fail: |