diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-07-01 15:20:01 +0100 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-07-01 15:28:56 +0100 |
| commit | 57225485fe72ca059e8c7d9fa17a07c3a31ba009 (patch) | |
| tree | 388f8b3be54051dde5f5dca68050910ae501797a /numpy/lib/recfunctions.py | |
| parent | bdbac02b0bddb265840cc00cc5dec0590c09b093 (diff) | |
| download | numpy-57225485fe72ca059e8c7d9fa17a07c3a31ba009.tar.gz | |
BUG: stack_arrays fails for subdtypes
Again, fixed by not using descr
Diffstat (limited to 'numpy/lib/recfunctions.py')
| -rw-r--r-- | numpy/lib/recfunctions.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index a0a070547..f66cfd32e 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -782,10 +782,10 @@ def stack_arrays(arrays, defaults=None, usemask=True, asrecarray=False, fldnames = [d.names for d in ndtype] # dtype_l = ndtype[0] - newdescr = dtype_l.descr + newdescr = get_fieldspec(dtype_l) names = [_[0] for _ in newdescr] for dtype_n in ndtype[1:]: - for descr in dtype_n.descr: + for descr in get_fieldspec(dtype_n): name = descr[0] or '' if name not in names: newdescr.append(descr) @@ -794,11 +794,11 @@ def stack_arrays(arrays, defaults=None, usemask=True, asrecarray=False, nameidx = names.index(name) current_descr = newdescr[nameidx] if autoconvert: - if np.dtype(descr[1]) > np.dtype(current_descr[-1]): + if descr[1] > current_descr[1]: current_descr = list(current_descr) - current_descr[-1] = descr[1] + current_descr[1] = descr[1] newdescr[nameidx] = tuple(current_descr) - elif descr[1] != current_descr[-1]: + elif descr[1] != current_descr[1]: raise TypeError("Incompatible type '%s' <> '%s'" % (dict(newdescr)[name], descr[1])) # Only one field: use concatenate |