summaryrefslogtreecommitdiff
path: root/numpy/oldnumeric/misc.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-13 07:15:52 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-13 07:15:52 +0000
commit01a0309eca710b4128df2c9b5ce3a6905281df4b (patch)
tree763d1e30b193a225625cefea5be5d210c02a641f /numpy/oldnumeric/misc.py
parent9584e277a057c490606cd8abb9100962f4676070 (diff)
downloadnumpy-01a0309eca710b4128df2c9b5ce3a6905281df4b.tar.gz
Change default axis argument of average and several masked array functions. Move old behaviors to compatibility layer.
Diffstat (limited to 'numpy/oldnumeric/misc.py')
-rw-r--r--numpy/oldnumeric/misc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index e8c2e3c00..a6c13d780 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -7,7 +7,7 @@ __all__ = ['load', 'sort', 'copy_reg', 'clip', 'putmask', 'Unpickler', 'rank',
'pi', 'math', 'concatenate',
'around', 'vdot', 'transpose', 'array2string', 'diagonal',
'searchsorted', 'put', 'fromfunction', 'copy', 'resize',
- 'array_repr', 'e', 'StringIO', 'pickle', 'average',
+ 'array_repr', 'e', 'StringIO', 'pickle',
'argsort', 'convolve', 'loads', 'cross_correlate',
'Pickler', 'dot', 'outerproduct', 'innerproduct']
@@ -22,7 +22,7 @@ from pickle import load, loads
from numpy import sort, clip, putmask, rank, sign, shape, allclose, size,\
choose, swapaxes, array_str, array_repr, e, pi, \
fromfunction, resize, around, concatenate, vdot, transpose, \
- diagonal, searchsorted, put, average, argsort, convolve, dot, \
+ diagonal, searchsorted, put, argsort, convolve, dot, \
outer as outerproduct, inner as innerproduct, correlate as cross_correlate
from array_printer import array2string