summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-10 13:33:45 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-10 13:33:45 +0000
commitc261b1f8fc16a0001d90fd3e024d2fd13f28ade1 (patch)
tree65f08eb25f15be993a8933747a54cb40c3d8ee30 /numpy/core/fromnumeric.py
parenta085eeb1a16daa01645afaa151225ab4ae66f240 (diff)
downloadnumpy-c261b1f8fc16a0001d90fd3e024d2fd13f28ade1.tar.gz
More fixes to masked array support of output arrays.
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 94d491c95..6dacdbf52 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -374,19 +374,19 @@ def amax(a, axis=None, out=None):
"""Return the maximum of 'a' along dimension axis.
"""
try:
- max = a.max
+ amax = a.max
except AttributeError:
return _wrapit(a, 'max', axis, out)
- return max(axis, out)
+ return amax(axis, out)
def amin(a, axis=None, out=None):
"""Return the minimum of a along dimension axis.
"""
try:
- min = a.min
+ amin = a.min
except AttributeError:
return _wrapit(a, 'min', axis, out)
- return min(axis, out)
+ return amin(axis, out)
def alen(a):
"""Return the length of a Python object interpreted as an array