diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2019-08-18 20:59:42 -0500 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2019-09-14 13:10:10 -0700 |
| commit | 003bdc25b75566de64a90e223338b4bd4565155a (patch) | |
| tree | e76bf039447d04291f413668ef8aee8efb04b84e | |
| parent | 31ffdecf07d18ed4dbb66b171cb0f998d4b190fa (diff) | |
| download | numpy-003bdc25b75566de64a90e223338b4bd4565155a.tar.gz | |
BUG: Fix flatten_dtype so that nested 0-field structs are flattened correctly
This affects the behavior of merge_arrays.
| -rw-r--r-- | numpy/lib/recfunctions.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_recfunctions.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index 40060b41a..024ba763f 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -200,7 +200,7 @@ def flatten_descr(ndtype): descr = [] for field in names: (typ, _) = ndtype.fields[field] - if typ.names: + if typ.names is not None: descr.extend(flatten_descr(typ)) else: descr.append((field, typ)) diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py index 0c839d486..38147a85e 100644 --- a/numpy/lib/tests/test_recfunctions.py +++ b/numpy/lib/tests/test_recfunctions.py @@ -378,8 +378,8 @@ class TestMergeArrays(object): z = np.array( [('A', 1.), ('B', 2.)], dtype=[('A', '|S3'), ('B', float)]) w = np.array( - [(1, (2, 3.0)), (4, (5, 6.0))], - dtype=[('a', int), ('b', [('ba', float), ('bb', int)])]) + [(1, (2, 3.0, ())), (4, (5, 6.0, ()))], + dtype=[('a', int), ('b', [('ba', float), ('bb', int), ('bc', [])])]) self.data = (w, x, y, z) def test_solo(self): @@ -450,8 +450,8 @@ class TestMergeArrays(object): test = merge_arrays((x, w), flatten=False) controldtype = [('f0', int), ('f1', [('a', int), - ('b', [('ba', float), ('bb', int)])])] - control = np.array([(1., (1, (2, 3.0))), (2, (4, (5, 6.0)))], + ('b', [('ba', float), ('bb', int), ('bc', [])])])] + control = np.array([(1., (1, (2, 3.0, ()))), (2, (4, (5, 6.0, ())))], dtype=controldtype) assert_equal(test, control) |