summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorMark Wiebe <mwwiebe@gmail.com>2011-08-24 16:24:52 -0700
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:27:01 -0600
commit770c94ef5ab2478bc9f5451f931613d7424459e1 (patch)
tree7a885fd8ac4dc5853c815628c2e6089afd6c94ff /numpy
parent847404a650757ba8ab6dae3af937890230b00f84 (diff)
downloadnumpy-770c94ef5ab2478bc9f5451f931613d7424459e1.tar.gz
DOC: missingdata: Add example of a C-API function supporting NA masks
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/conversion_utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
index 91b77ac9d..2090df2f0 100644
--- a/numpy/core/src/multiarray/conversion_utils.c
+++ b/numpy/core/src/multiarray/conversion_utils.c
@@ -41,7 +41,8 @@ PyArray_Converter(PyObject *object, PyObject **address)
return PY_SUCCEED;
}
else {
- *address = PyArray_FromAny(object, NULL, 0, 0, NPY_ARRAY_CARRAY, NULL);
+ *address = PyArray_FromAny(object, NULL, 0, 0,
+ NPY_ARRAY_CARRAY | NPY_ARRAY_ALLOWNA, NULL);
if (*address == NULL) {
return PY_FAIL;
}