summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorEric Fode <ericfode@gmail.com>2012-07-15 01:31:25 -0400
committerEric Fode <ericfode@gmail.com>2012-07-15 01:31:25 -0400
commit120c6bdca272717c21ce4d79c29142ef64c457c0 (patch)
treeb5e2d8fc4eb91d0b0da10e8ab1c6fae9aa188bfd /numpy
parent681bceb247b960b8939e021713f00d0de09900cb (diff)
downloadnumpy-120c6bdca272717c21ce4d79c29142ef64c457c0.tar.gz
more tabs removed (hunting for c formatter to take care of this next time)
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/common.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c
index f7e891174..4973df1be 100644
--- a/numpy/core/src/multiarray/common.c
+++ b/numpy/core/src/multiarray/common.c
@@ -36,17 +36,17 @@ _array_find_python_scalar_type(PyObject *op)
/* if integer can fit into a longlong then return that*/
if ((PyLong_AsLongLong(op) == -1) && PyErr_Occurred()) {
PyErr_Clear();
- if((PyLong_AsUnsignedLongLong(op) == -1) && PyErr_Occurred()){
- PyErr_Clear();
- }
- else {
- return PyArray_DescrFromType(NPY_ULONGLONG);
- }
+ if((PyLong_AsUnsignedLongLong(op) == -1) && PyErr_Occurred()){
+ PyErr_Clear();
+ }
+ else {
+ return PyArray_DescrFromType(NPY_ULONGLONG);
+ }
return PyArray_DescrFromType(NPY_OBJECT);
- }
+ }
else {
return PyArray_DescrFromType(NPY_LONGLONG);
- }
+ }
}
return NULL;
}