diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-02-17 16:48:37 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-02-17 16:48:37 +0000 |
| commit | 5a94724db09b6221be97e83af9a02033c7cda98b (patch) | |
| tree | 59a6174c9ca838c2bfd566d614e9e6b7520df1b6 /numpy | |
| parent | 7e4e3e83556533abdcbb43d9f0e369076ee4b624 (diff) | |
| download | numpy-5a94724db09b6221be97e83af9a02033c7cda98b.tar.gz | |
STY: Remove hard tabs, reindent.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index d1ce6e023..734777e0e 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -2514,17 +2514,18 @@ construct_reduce(PyUFuncObject *self, PyArrayObject **arr, PyArrayObject *out, else { loop->obj = 0; } - if ((loop->meth == ZERO_EL_REDUCELOOP) || - ((operation == UFUNC_REDUCEAT) && (loop->meth == BUFFER_UFUNCLOOP))) { + if ((loop->meth == ZERO_EL_REDUCELOOP) + || ((operation == UFUNC_REDUCEAT) + && (loop->meth == BUFFER_UFUNCLOOP))) { idarr = _getidentity(self, otype, str); if (idarr == NULL) { goto fail; } if (idarr->descr->elsize > UFUNC_MAXIDENTITY) { PyErr_Format(PyExc_RuntimeError, - "UFUNC_MAXIDENTITY (%d)" \ - " is too small (needs to be at least %d)", - UFUNC_MAXIDENTITY, idarr->descr->elsize); + "UFUNC_MAXIDENTITY (%d) is too small"\ + "(needs to be at least %d)", + UFUNC_MAXIDENTITY, idarr->descr->elsize); Py_DECREF(idarr); goto fail; } @@ -2555,7 +2556,7 @@ construct_reduce(PyUFuncObject *self, PyArrayObject **arr, PyArrayObject *out, if (out == NULL) { loop->ret = (PyArrayObject *) PyArray_New(Py_TYPE(aar), aar->nd, aar->dimensions, - otype, NULL, NULL, 0, 0, (PyObject *)aar); + otype, NULL, NULL, 0, 0, (PyObject *)aar); } else { outsize = PyArray_MultiplyList(aar->dimensions, aar->nd); @@ -2568,7 +2569,7 @@ construct_reduce(PyUFuncObject *self, PyArrayObject **arr, PyArrayObject *out, if (out == NULL) { loop->ret = (PyArrayObject *) PyArray_New(Py_TYPE(aar), aar->nd, loop_i, otype, - NULL, NULL, 0, 0, (PyObject *)aar); + NULL, NULL, 0, 0, (PyObject *)aar); } else { outsize = PyArray_MultiplyList(loop_i, aar->nd); @@ -2585,7 +2586,7 @@ construct_reduce(PyUFuncObject *self, PyArrayObject **arr, PyArrayObject *out, if (out) { if (PyArray_SIZE(out) != outsize) { PyErr_SetString(PyExc_ValueError, - "wrong shape for output"); + "wrong shape for output"); goto fail; } loop->ret = (PyArrayObject *) |