[pypy-commit] pypy default: backout d50d27c01818, doesn't work as intended when translated

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r68008:277365bc6cda
Date: 2013-11-13 20:03 -0500
http://bitbucket.org/pypy/pypy/changeset/277365bc6cda/

Log:	backout d50d27c01818, doesn't work as intended when translated

diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -213,10 +213,7 @@
 
     def descr_setitem(self, space, w_idx, w_value):
         if isinstance(w_idx, W_NDimArray) and w_idx.get_dtype().is_bool_type():
-            try:
-                self.setitem_filter(space, w_idx, convert_to_array(space, w_value))
-            except ValueError, e:
-                raise OperationError(space.w_ValueError, space.wrap(str(e)))
+            self.setitem_filter(space, w_idx, convert_to_array(space, w_value))
             return
         try:
             self.implementation.descr_setitem(space, self, w_idx, w_value)
diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2461,23 +2461,6 @@
         assert exc.value[0].find('cannot assign') >= 0
         assert (a == [[0, 1], [2, 3], [4, 5]]).all()
 
-    def test_nonarray_assignment(self):
-        import numpypy as np
-        a = np.arange(10)
-        b = np.ones(10, dtype=bool)
-        r = np.arange(10)
-        def assign(a, b, c):
-            a[b] = c
-        raises(ValueError, assign, a, b, np.nan)
-        #raises(ValueError, assign, a, r, np.nan)  # XXX
-        import sys
-        if '__pypy__' not in sys.builtin_module_names:
-            a[b] = np.array(np.nan)
-            #a[r] = np.array(np.nan)
-        else:
-            raises(ValueError, assign, a, b, np.array(np.nan))
-            #raises(ValueError, assign, a, r, np.array(np.nan))
-
     def test_copy_kwarg(self):
         from numpypy import array
         x = array([1, 2, 3])