summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2009-12-10 19:31:29 +0000
committerPauli Virtanen <pav@iki.fi>2009-12-10 19:31:29 +0000
commit977e43600cbd7056b84d7ee802dc1402cb4b0bc5 (patch)
tree58c91539e6f79fcf8cb5bd8d74ef61abfc728959
parent794a6c4511ced84c74bc8f2dd8cd8f277925a6ac (diff)
downloadnumpy-977e43600cbd7056b84d7ee802dc1402cb4b0bc5.tar.gz
BUG: complex cast warning should be triggered only for casts to number types
-rw-r--r--numpy/core/src/multiarray/convert_datatype.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c
index 229b8136d..93c0bc22a 100644
--- a/numpy/core/src/multiarray/convert_datatype.c
+++ b/numpy/core/src/multiarray/convert_datatype.c
@@ -108,7 +108,9 @@ PyArray_GetCastFunc(PyArray_Descr *descr, int type_num)
}
}
if (PyTypeNum_ISCOMPLEX(descr->type_num) &&
- !PyTypeNum_ISCOMPLEX(type_num)) {
+ !PyTypeNum_ISCOMPLEX(type_num) &&
+ PyTypeNum_ISNUMBER(type_num) &&
+ !PyTypeNum_ISBOOL(type_num)) {
PyObject *cls = NULL, *obj = NULL;
obj = PyImport_ImportModule("numpy.core");
if (obj) {