From 6688b8de88a78abe450d0518efd11fc51988cb38 Mon Sep 17 00:00:00 2001
From: pierregm <pierregm@localhost>
Date: Mon, 22 Mar 2010 01:45:40 +0000
Subject: * Use putmask instead of fancy indexing in _nanop (bug #1421)

---
 numpy/lib/function_base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'numpy/lib/function_base.py')

diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 82503a54e..87ecf717e 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -1282,7 +1282,10 @@ def _nanop(op, fill, a, axis=None):
 
     # We only need to take care of NaN's in floating point arrays
     if not np.issubdtype(y.dtype, int):
-       y[mask] = fill
+        # y[mask] = fill
+        # We can't use fancy indexing here as it'll mess w/ MaskedArrays
+        # Instead, let's fill the array directly...
+        np.putmask(y, mask, fill)
 
     res = op(y, axis=axis)
     mask_all_along_axis = mask.all(axis=axis)
-- 
cgit v1.2.1