diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-08-01 17:41:28 +0000 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-08-05 21:50:05 -0500 |
| commit | 0ab1a2b12baabe3bd7063e2963c83482a4f57016 (patch) | |
| tree | 71c57ab35bf1697944b98a2a1259bfb9f62f3dd4 /numpy/core/numeric.py | |
| parent | fb004f8bc610b0cf52342d35314a9e0a0434e745 (diff) | |
| download | numpy-0ab1a2b12baabe3bd7063e2963c83482a4f57016.tar.gz | |
MAINT: Simplify test for string-likes
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 13a99505c..7d53f2b68 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -436,8 +436,7 @@ def count_nonzero(a, axis=None): if issubdtype(a.dtype, np.number): return (a != 0).sum(axis=axis, dtype=np.intp) - if (issubdtype(a.dtype, np.string_) or - issubdtype(a.dtype, np.unicode_)): + if issubdtype(a.dtype, np.character): nullstr = a.dtype.type('') return (a != nullstr).sum(axis=axis, dtype=np.intp) |