diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/common.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c index 82c2b8f71..9c2e15ae9 100644 --- a/numpy/core/src/multiarray/common.c +++ b/numpy/core/src/multiarray/common.c @@ -37,13 +37,15 @@ _array_find_python_scalar_type(PyObject *op) if ((PyLong_AsLongLong(op) == -1) && PyErr_Occurred()) { PyErr_Clear(); if((PyLong_AsUnsignedLongLong(op) == -1) && PyErr_Occurred()){ - PyErr_Clear(); - } else { - return PyArray_DescrFromType(NPY_ULONGLONG); + PyErr_Clear(); + } + else { + return PyArray_DescrFromType(NPY_ULONGLONG); } return PyArray_DescrFromType(NPY_OBJECT); - } else { - return PyArray_DescrFromType(NPY_LONGLONG); + } + else { + return PyArray_DescrFromType(NPY_LONGLONG); } } return NULL; |