Author: David Schneider <[email protected]>
Branch: disable_merge_different_int_types
Changeset: r49962:78c6f8cf48ab
Date: 2011-11-29 15:08 +0100
http://bitbucket.org/pypy/pypy/changeset/78c6f8cf48ab/
Log: merge default
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
@@ -263,7 +263,7 @@
assert a[1] == 0.
assert a[3] == 1.
b[::-1] = b
- assert b[0] == 1.
+ assert b[0] == 0.
assert b[1] == 0.
def test_setslice_of_slice_array(self):
@@ -751,11 +751,14 @@
assert not bool(array([0]))
def test_slice_assignment(self):
- from numpypy import arange
- a = arange(5)
+ from numpypy import array
+ a = array(range(5))
a[::-1] = a
assert (a == [0, 1, 2, 1, 0]).all()
-
+ # but we force intermediates
+ a = array(range(5))
+ a[::-1] = a + a
+ assert (a == [8, 6, 4, 2, 0]).all()
class AppTestMultiDim(BaseNumpyAppTest):
def test_init(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
