Author: Brian Kearns <[email protected]>
Branch:
Changeset: r68537:9c94d5651eef
Date: 2013-12-24 16:59 -0500
http://bitbucket.org/pypy/pypy/changeset/9c94d5651eef/
Log: this too
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -558,8 +558,6 @@
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,
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
@@ -2840,7 +2840,11 @@
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
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
