summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-09-09 15:44:56 -0500
committerGitHub <noreply@github.com>2017-09-09 15:44:56 -0500
commit68a58e03a1661b8d95877771f6e7fa87ddf7c183 (patch)
tree86687005dc5cf44a0576a7682e5babb658dcd3e4 /numpy/lib
parentf2173183ee34a39c1803f6237e5ab9fe909736c4 (diff)
parent9f27418f48ada95a1cf19c98a8d1116f97f86ec5 (diff)
downloadnumpy-68a58e03a1661b8d95877771f6e7fa87ddf7c183.tar.gz
Merge pull request #6053 from ahaldane/multifield_structassign
MAINT: struct assignment "by field position", multi-field indices return views
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/tests/test_io.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index f2fd37230..e6b1eac7a 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -1178,12 +1178,12 @@ M 33 21.99
conv = {0: int, 1: int, 2: int, 3: lambda r: dmap[r.decode()]}
test = np.recfromcsv(TextIO(dstr,), dtype=dtyp, delimiter=',',
names=None, converters=conv)
- control = np.rec.array([[1,5,-1,0], [2,8,-1,1], [3,3,-2,3]], dtype=dtyp)
+ control = np.rec.array([(1,5,-1,0), (2,8,-1,1), (3,3,-2,3)], dtype=dtyp)
assert_equal(test, control)
dtyp = [('e1','i4'),('e2','i4'),('n', 'i1')]
test = np.recfromcsv(TextIO(dstr,), dtype=dtyp, delimiter=',',
usecols=(0,1,3), names=None, converters=conv)
- control = np.rec.array([[1,5,0], [2,8,1], [3,3,3]], dtype=dtyp)
+ control = np.rec.array([(1,5,0), (2,8,1), (3,3,3)], dtype=dtyp)
assert_equal(test, control)
def test_dtype_with_object(self):