summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorpierregm <pierregm@localhost>2008-03-18 23:17:50 +0000
committerpierregm <pierregm@localhost>2008-03-18 23:17:50 +0000
commit38ad50efa0e871e8f0e17babe015242a19b13d58 (patch)
tree5b4d8ebafac37fc4395301eed092de15e4f970aa /numpy
parentc70befd85326cd6be09877011b14278d081caec0 (diff)
downloadnumpy-38ad50efa0e871e8f0e17babe015242a19b13d58.tar.gz
reverted to a proper version of __getitem__
Diffstat (limited to 'numpy')
-rw-r--r--numpy/ma/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 1d805d7c5..027410295 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -1306,7 +1306,7 @@ class MaskedArray(numeric.ndarray):
m = self._mask
if not getattr(dout,'ndim', False):
# Just a scalar............
- if (not m.ndim and not m) or m[indx]:
+ if m is not nomask and m[indx]:
return masked
else:
# Force dout to MA ........