summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorhemildesai <desai38@purdue.edu>2017-09-19 22:01:29 -0700
committerEric Wieser <wieser.eric@gmail.com>2017-09-28 23:17:06 -0700
commit6fbbadb676dfa7cee56be3bd17b92bde661f8869 (patch)
tree7abc4e908eb7126028ae37bf8ce1a6da16f8a2e7 /numpy/core/numeric.py
parentcea77c21cd0907afc0093b7301d7824d73f7c740 (diff)
downloadnumpy-6fbbadb676dfa7cee56be3bd17b92bde661f8869.tar.gz
DEP: Deprecate truth testing on empty arrays
Fixes #9583
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index ce17a1900..5b10361fe 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -406,7 +406,7 @@ def count_nonzero(a, axis=None):
array([2, 3])
"""
- if axis is None or axis == ():
+ if axis is None or (isinstance(axis, tuple) and axis == ()):
return multiarray.count_nonzero(a)
a = asanyarray(a)