Author: Brian Kearns <[email protected]>
Branch:
Changeset: r68519:a93131d9b1c2
Date: 2013-12-20 17:38 -0500
http://bitbucket.org/pypy/pypy/changeset/a93131d9b1c2/
Log: partially fix scalar record getitem
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
@@ -3102,6 +3102,12 @@
from numpypy import zeros
a = [('x', int), ('y', float)]
b = [('x', int), ('y', a)]
+ arr = zeros((), dtype=b)
+ assert arr['x'] == 0
+ arr['y']
+ #assert arr['y'].shape == ()
+ #assert arr['y'][()][0] == 0
+ #assert arr['y'][()][0] == 0
arr = zeros(3, dtype=b)
arr[1]['x'] = 15
assert arr[1]['x'] == 15
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1846,7 +1846,7 @@
@jit.unroll_safe
def store(self, arr, i, ofs, box):
assert isinstance(box, interp_boxes.W_VoidBox)
- for k in range(box.arr.dtype.get_size()):
+ for k in range(box.dtype.get_size()):
arr.storage[k + i] = box.arr.storage[k + box.ofs]
def to_builtin_type(self, space, box):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
