diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2015-03-12 18:42:59 -0400 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2015-03-12 18:42:59 -0400 |
commit | e84454aded855a70c3dcfd586a3a0c0e108d0ab7 (patch) | |
tree | d33488675ac1dd3f2092ba5de05e11d857cc12e0 /numpy/lib/tests/test_stride_tricks.py | |
parent | 27c68a30de03fbf65bc949e014851644f436fda8 (diff) | |
parent | 0808ae8fc5e3d539989aeceb74cbac35bb55598e (diff) | |
download | numpy-e84454aded855a70c3dcfd586a3a0c0e108d0ab7.tar.gz |
Merge pull request #5519 from jaimefrio/array_interface_dtype
ENH: PyArray_FromInterface checks descr if typestr is np.void
Diffstat (limited to 'numpy/lib/tests/test_stride_tricks.py')
-rw-r--r-- | numpy/lib/tests/test_stride_tricks.py | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_stride_tricks.py b/numpy/lib/tests/test_stride_tricks.py index ef483921c..e079e0bf4 100644 --- a/numpy/lib/tests/test_stride_tricks.py +++ b/numpy/lib/tests/test_stride_tricks.py @@ -290,6 +290,29 @@ def test_as_strided(): expected = np.array([[1, 2, 3, 4], [1, 2, 3, 4], [1, 2, 3, 4]]) assert_array_equal(a_view, expected) + # Regression test for gh-5081 + dt = np.dtype([('num', 'i4'), ('obj', 'O')]) + a = np.empty((4,), dtype=dt) + a['num'] = np.arange(1, 5) + a_view = as_strided(a, shape=(3, 4), strides=(0, a.itemsize)) + expected_num = [[1, 2, 3, 4]] * 3 + expected_obj = [[None]*4]*3 + assert_equal(a_view.dtype, dt) + assert_array_equal(expected_num, a_view['num']) + assert_array_equal(expected_obj, a_view['obj']) + + # Make sure that void types without fields are kept unchanged + a = np.empty((4,), dtype='V4') + a_view = as_strided(a, shape=(3, 4), strides=(0, a.itemsize)) + assert_equal(a.dtype, a_view.dtype) + + # Make sure that the only type that could fail is properly handled + dt = np.dtype({'names': [''], 'formats': ['V4']}) + a = np.empty((4,), dtype=dt) + a_view = as_strided(a, shape=(3, 4), strides=(0, a.itemsize)) + assert_equal(a.dtype, a_view.dtype) + + class VerySimpleSubClass(np.ndarray): def __new__(cls, *args, **kwargs): |