Author: Brian Kearns <bdkea...@gmail.com>
Branch: numpypy-nditer
Changeset: r69734:f7b0b2365c0f
Date: 2014-03-05 16:01 -0500
http://bitbucket.org/pypy/pypy/changeset/f7b0b2365c0f/
Log: merge this test with the existing one
diff --git a/pypy/module/micronumpy/test/test_ndarray.py
b/pypy/module/micronumpy/test/test_ndarray.py
--- a/pypy/module/micronumpy/test/test_ndarray.py
+++ b/pypy/module/micronumpy/test/test_ndarray.py
@@ -2116,23 +2116,6 @@
assert (b == [20, 1, 21, 3, 4]).all()
raises(ValueError, "array([1, 2])[array([True, False, True])] = [1, 2,
3]")
- def test_ellipse_index(self):
- from numpypy import arange, array
- b = arange(24).reshape(2,3,4)
- b[...] = 100
- assert (b == 100).all()
- assert b.shape == (2, 3, 4)
- b[...] = [10, 20, 30, 40]
- assert (b[:,:,0] == 10).all()
- assert (b[0,0,:] == [10, 20, 30, 40]).all()
- assert b.shape == b[...].shape
- assert (b == b[...]).all()
-
- a = array(1)
- a[...] = 100
- assert (a == 100).all()
- assert a == a[...]
-
def test_weakref(self):
import _weakref
from numpypy import array
@@ -2345,6 +2328,16 @@
a[...] = 4
assert (a == [4, 4, 4]).all()
+ b = np.arange(24).reshape(2,3,4)
+ b[...] = 100
+ assert (b == 100).all()
+ assert b.shape == (2, 3, 4)
+ b[...] = [10, 20, 30, 40]
+ assert (b[:,:,0] == 10).all()
+ assert (b[0,0,:] == [10, 20, 30, 40]).all()
+ assert b.shape == b[...].shape
+ assert (b == b[...]).all()
+
class AppTestNumArrayFromBuffer(BaseNumpyAppTest):
spaceconfig = dict(usemodules=["micronumpy", "array", "mmap"])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
