diff options
| author | mattip <matti.picus@gmail.com> | 2019-02-11 23:54:14 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2019-02-11 23:54:14 +0200 |
| commit | f07adb36c377bf979bc348f67f5fe4351c2430ab (patch) | |
| tree | 6714c798dcbae7c18a125805484ad863e55c6081 | |
| parent | 944dd6ee738da131d5ae5cbf783af379d424514c (diff) | |
| download | numpy-f07adb36c377bf979bc348f67f5fe4351c2430ab.tar.gz | |
MAINT: fixes from review
| -rw-r--r-- | numpy/core/src/umath/_struct_ufunc_tests.c.src | 9 | ||||
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_ufunc.py | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/numpy/core/src/umath/_struct_ufunc_tests.c.src b/numpy/core/src/umath/_struct_ufunc_tests.c.src index 0b9aee7fa..3eaac73e1 100644 --- a/numpy/core/src/umath/_struct_ufunc_tests.c.src +++ b/numpy/core/src/umath/_struct_ufunc_tests.c.src @@ -61,7 +61,7 @@ register_fail(PyObject* NPY_UNUSED(self), PyObject* NPY_UNUSED(args)) "add_triplet_docstring", 0); dtype_dict = Py_BuildValue("[(s, s), (s, s), (s, s)]", - "f0", "u8", "f1", "u8", "f2", "u8"); + "f0", "u8", "f1", "u8", "f2", "u8"); PyArray_DescrConverter(dtype_dict, &dtype); Py_DECREF(dtype_dict); @@ -75,8 +75,9 @@ register_fail(PyObject* NPY_UNUSED(self), PyObject* NPY_UNUSED(args)) dtypes, NULL); - Py_DECREF(dtype); if (retval < 0) { + Py_DECREF(add_triplet); + Py_DECREF(dtype); return NULL; } retval = PyUFunc_RegisterLoopForDescr((PyUFuncObject *)add_triplet, @@ -84,7 +85,7 @@ register_fail(PyObject* NPY_UNUSED(self), PyObject* NPY_UNUSED(args)) &add_uint64_triplet, dtypes, NULL); - + Py_DECREF(add_triplet); Py_DECREF(dtype); if (retval < 0) { return NULL; @@ -146,7 +147,7 @@ PyMODINIT_FUNC init_struct_ufunc_tests(void) "add_triplet_docstring", 0); dtype_dict = Py_BuildValue("[(s, s), (s, s), (s, s)]", - "f0", "u8", "f1", "u8", "f2", "u8"); + "f0", "u8", "f1", "u8", "f2", "u8"); PyArray_DescrConverter(dtype_dict, &dtype); Py_DECREF(dtype_dict); diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 800f6c8ad..f198a19bd 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -5199,7 +5199,7 @@ PyUFunc_RegisterLoopForDescr(PyUFuncObject *ufunc, current->nargs = ufunc->nargs; } else { - PyErr_SetString(PyExc_ValueError, + PyErr_SetString(PyExc_RuntimeError, "loop already registered"); result = -1; } diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index 3f5b63552..9e5e3fb77 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -1580,7 +1580,7 @@ class TestUfunc(object): result = struct_ufunc.add_triplet(a, b) assert_equal(result, np.array([(2, 4, 6)], dtype='u8,u8,u8')) - assert_raises(ValueError, struct_ufunc.register_fail) + assert_raises(RuntimeError, struct_ufunc.register_fail) def test_custom_ufunc(self): a = np.array( |