diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-12-04 12:10:01 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-12-04 12:10:01 -0700 |
| commit | 059334c491940752b08070074cc221b69487e5e4 (patch) | |
| tree | af0f7f2fc5df28bc75bdaeb0e3bbc8815eb0f829 /numpy | |
| parent | e9c42cab112d94dbcade9f1afc64b26af0521e14 (diff) | |
| download | numpy-059334c491940752b08070074cc221b69487e5e4.tar.gz | |
STY: Small coding style cleanups.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/convert_datatype.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c index 818d558aa..43cfc10dd 100644 --- a/numpy/core/src/multiarray/convert_datatype.c +++ b/numpy/core/src/multiarray/convert_datatype.c @@ -87,12 +87,13 @@ PyArray_GetCastFunc(PyArray_Descr *descr, int type_num) } } if (PyTypeNum_ISCOMPLEX(descr->type_num) && - !PyTypeNum_ISCOMPLEX(type_num) && - PyTypeNum_ISNUMBER(type_num) && - !PyTypeNum_ISBOOL(type_num)) { + !PyTypeNum_ISCOMPLEX(type_num) && + PyTypeNum_ISNUMBER(type_num) && + !PyTypeNum_ISBOOL(type_num)) { PyObject *cls = NULL, *obj = NULL; int ret; obj = PyImport_ImportModule("numpy.core"); + if (obj) { cls = PyObject_GetAttrString(obj, "ComplexWarning"); Py_DECREF(obj); @@ -109,7 +110,7 @@ PyArray_GetCastFunc(PyArray_Descr *descr, int type_num) Py_XDECREF(cls); if (ret < 0) { return NULL; - } + } } if (castfunc) { return castfunc; |