diff options
| author | zjpoh <poh.zijie@gmail.com> | 2019-09-26 22:04:11 -0700 |
|---|---|---|
| committer | zjpoh <poh.zijie@gmail.com> | 2019-09-26 22:04:11 -0700 |
| commit | 27332a8b2b098a519e8ade0706e1ae4086f15b92 (patch) | |
| tree | 4d28425c7df1fa9127a8f1cd9a3c04f449fb35e2 /numpy/core/_internal.py | |
| parent | f779af07a92cb419b964316960a1b503df9b712d (diff) | |
| parent | 68bd6e359a6b0863acf39cad637e1444d78eabd0 (diff) | |
| download | numpy-27332a8b2b098a519e8ade0706e1ae4086f15b92.tar.gz | |
Merge branch 'master' into from_string_complex
Diffstat (limited to 'numpy/core/_internal.py')
| -rw-r--r-- | numpy/core/_internal.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index c70718cb6..b0ea603e1 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -459,7 +459,7 @@ def _getfield_is_safe(oldtype, newtype, offset): if newtype.hasobject or oldtype.hasobject: if offset == 0 and newtype == oldtype: return - if oldtype.names: + if oldtype.names is not None: for name in oldtype.names: if (oldtype.fields[name][1] == offset and oldtype.fields[name][0] == newtype): |