summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-05 07:48:48 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-05 07:48:48 +0000
commit3457ac34f84f502de194ad825c0db4cb0d56dc82 (patch)
tree3b76d6ccfb0d3cbeddff00e7c7d359d5fa541d1e /numpy/core/fromnumeric.py
parent0820b2a2c8cebe828c1a9faa1bef45a8b0421100 (diff)
downloadnumpy-3457ac34f84f502de194ad825c0db4cb0d56dc82.tar.gz
Fix uses of nonzero and add flatnonzero
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 98291f411..5c21edd3b 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -230,8 +230,7 @@ def ravel(m,order='C'):
return a.ravel(order)
def nonzero(a):
- """nonzero(a) returns the indices of the elements of a which are not zero,
- a must be 1d
+ """nonzero(a) returns the indices of the elements of a which are not zero
"""
try:
nonzero = a.nonzero
@@ -241,7 +240,6 @@ def nonzero(a):
res = nonzero()
return res
-
def shape(a):
"""shape(a) returns the shape of a (as a function call which
also works on nested sequences).