From 4596572c65c77590fff709a85a3992254cc145d3 Mon Sep 17 00:00:00 2001
From: sasha <sasha@localhost>
Date: Sun, 8 Jan 2006 07:07:40 +0000
Subject: Fixed the case when scalar mask is not None but False (see r1850)

---
 numpy/core/ma.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'numpy/core/ma.py')

diff --git a/numpy/core/ma.py b/numpy/core/ma.py
index 74594f97c..b4467bf73 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -1228,8 +1228,10 @@ array(data = %(data)s,
                     #ok, if scalar
                     if d.shape:
                         raise
-                    else:
+                    elif m:
                         result = numeric.array(value, dtype=d.dtype)
+                    else:
+                        result = d
             return result
 
     def ids (self):
-- 
cgit v1.2.1