Commits

Brian Kearns committed 9c94d56

this too

  • Participants
  • Parent commits 5c89e49

Comments (0)

Files changed (2)

pypy/module/micronumpy/interp_ufuncs.py

         return find_binop_result_dtype(space, float_dtype, current_guess)
     elif space.isinstance_w(w_obj, space.w_complex):
         return complex_dtype
-    elif space.isinstance_w(w_obj, space.w_slice):
-        return long_dtype
     elif space.isinstance_w(w_obj, space.w_str):
         if current_guess is None:
             return interp_dtype.variable_dtype(space,

pypy/module/micronumpy/test/test_numarray.py

         assert b[35] == 200
         b[[slice(25, 30)]] = range(5)
         assert all(a[:5] == range(5))
-        raises(TypeError, 'b[[[slice(25, 125)]]]')
+        import sys
+        if '__pypy__' not in sys.builtin_module_names:
+            raises(TypeError, 'b[[[slice(25, 125)]]]')
+        else:
+            raises(NotImplementedError, 'b[[[slice(25, 125)]]]')
 
     def test_cumsum(self):
         from numpypy import arange