summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2008-04-23 00:20:57 +0000
committerCharles Harris <charlesr.harris@gmail.com>2008-04-23 00:20:57 +0000
commit54b45e71fdf03556c39a27e53751d3199d21d64c (patch)
tree6ce80975c730ae2638dc493578b5e433b82964cf /numpy/core
parent0a6d8a6b0c44fcf58f126d060840d8a0baf7e240 (diff)
downloadnumpy-54b45e71fdf03556c39a27e53751d3199d21d64c.tar.gz
Make None be NaN for float types.
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/src/arraytypes.inc.src6
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src
index 26b8a5010..7272fa5c4 100644
--- a/numpy/core/src/arraytypes.inc.src
+++ b/numpy/core/src/arraytypes.inc.src
@@ -29,8 +29,12 @@ static double
MyPyFloat_AsDouble(PyObject *obj)
{
double ret = 0;
- PyObject *num = PyNumber_Float(obj);
+ PyObject *num;
+ if (obj == Py_None) {
+ return _getNAN();
+ }
+ num = PyNumber_Float(obj);
if (num == NULL) {
return _getNAN();
}