Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r80690:34811652db74
Date: 2015-11-15 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/34811652db74/
Log: merge heads
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -684,8 +684,9 @@
arr_iter, arr_state = arr.create_iter()
arr_dtype = arr.get_dtype()
index_dtype = index.get_dtype()
- # XXX length of shape of index as well?
- while not index_iter.done(index_state):
+ # support the deprecated form where arr([True]) will return arr[0, ...]
+ # by iterating over res_iter, not index_iter
+ while not res_iter.done(res_state):
getitem_filter_driver.jit_merge_point(shapelen=shapelen,
index_dtype=index_dtype,
arr_dtype=arr_dtype,
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
@@ -2238,6 +2238,9 @@
c = array([True,False,True],bool)
b = a[c]
assert (a[c] == [[1, 2, 3], [7, 8, 9]]).all()
+ c = array([True])
+ b = a[c]
+ assert b.shape == (1, 3)
def test_bool_array_index_setitem(self):
from numpy import arange, array
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
