Author: Maciej Fijalkowski <[email protected]>
Branch: numpy-indexing-by-arrays-2
Changeset: r51517:b5668c7a1c53
Date: 2012-01-20 12:24 +0200
http://bitbucket.org/pypy/pypy/changeset/b5668c7a1c53/
Log: more tests and a fix
diff --git a/pypy/module/micronumpy/interp_iter.py
b/pypy/module/micronumpy/interp_iter.py
--- a/pypy/module/micronumpy/interp_iter.py
+++ b/pypy/module/micronumpy/interp_iter.py
@@ -239,7 +239,7 @@
for i in range(shapelen - 1, -1, -1):
if self.indices[i] < self.shape[i] - 1:
self.indices[i] += 1
- self.chunk_iters[i] = self.chunk_iters[i].next()
+ self.chunk_iters[i] = self.chunk_iters[i].next(shapelen)
break
else:
self.indices[i] = 0
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
@@ -1312,6 +1312,10 @@
raises(IndexError,'arange(3)[array([15])]')
assert arange(3)[array([-3])] == 0
raises(IndexError,'arange(3)[array([-15])]')
+ a = arange(10)
+ assert (a[array([3, 2, 1])] == [3, 2, 1]).all()
+ raises(IndexError, 'a[array([3, 2, 1, 15])]')
+ assert (a[array([3, 2, 5, 3])] == [3, 2, 5, 3]).all()
def test_fill(self):
from _numpypy import array
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
