Author: Matti Picus <[email protected]>
Branch:
Changeset: r85666:6b0ba4b3816d
Date: 2016-07-12 09:32 -0500
http://bitbucket.org/pypy/pypy/changeset/6b0ba4b3816d/
Log: test fix for np.array()[...] returning a view (njs)
diff --git a/pypy/module/micronumpy/ndarray.py
b/pypy/module/micronumpy/ndarray.py
--- a/pypy/module/micronumpy/ndarray.py
+++ b/pypy/module/micronumpy/ndarray.py
@@ -254,7 +254,7 @@
idx = space.str_w(w_idx)
return self.getfield(space, idx)
if space.is_w(w_idx, space.w_Ellipsis):
- return self
+ return self.descr_view(space, space.type(self))
elif isinstance(w_idx, W_NDimArray) and w_idx.get_dtype().is_bool():
if w_idx.ndims() > 0:
w_ret = self.getitem_filter(space, w_idx)
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
@@ -2614,17 +2614,11 @@
import numpy as np
import sys
a = np.array(1.5)
- if '__pypy__' in sys.builtin_module_names:
- assert a[...] is a
- else:
- assert a[...].base is a
+ assert a[...].base is a
a[...] = 2.5
assert a == 2.5
a = np.array([1, 2, 3])
- if '__pypy__' in sys.builtin_module_names:
- assert a[...] is a
- else:
- assert a[...].base is a
+ assert a[...].base is a
a[...] = 4
assert (a == [4, 4, 4]).all()
assert a[..., 0] == 4
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
