summaryrefslogtreecommitdiff
path: root/numpy/core/ma.py
diff options
context:
space:
mode:
authorsasha <sasha@localhost>2006-01-08 07:07:40 +0000
committersasha <sasha@localhost>2006-01-08 07:07:40 +0000
commit4596572c65c77590fff709a85a3992254cc145d3 (patch)
treec848503d6fbd30e4f1fe497f3e1365dc56497e06 /numpy/core/ma.py
parent9974432933d79aa0ec94344a56e280bd015b7652 (diff)
downloadnumpy-4596572c65c77590fff709a85a3992254cc145d3.tar.gz
Fixed the case when scalar mask is not None but False (see r1850)
Diffstat (limited to 'numpy/core/ma.py')
-rw-r--r--numpy/core/ma.py4
1 files changed, 3 insertions, 1 deletions
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):