summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorsasha <sasha@localhost>2006-01-09 04:33:38 +0000
committersasha <sasha@localhost>2006-01-09 04:33:38 +0000
commite3d3245e3c02bda0493fc020f354341bba2e285c (patch)
tree10c5195eb4d6f4ee4debc44b2a8511626b932a42 /numpy
parentff02df4a7561baf68e2906a336658f34dd670a23 (diff)
downloadnumpy-e3d3245e3c02bda0493fc020f354341bba2e285c.tar.gz
Undo r1855. x[m] does not raise ValueError anymore.
See Travis' r1836.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/ma.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py
index af3cc69e4..b4467bf73 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -1219,7 +1219,7 @@ array(data = %(data)s,
try:
result = numeric.array(d, dtype=d.dtype, copy=1)
result[m] = value
- except (TypeError, AttributeError, ValueError):
+ except (TypeError, AttributeError):
#ok, can't put that value in here
value = numeric.array(value, dtype=object)
d = d.astype(object)