diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-09-22 19:42:43 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-09-22 19:42:43 +0000 |
| commit | 310b6d0be5f3277a4bb233564e2b476b676ad646 (patch) | |
| tree | aff876c03ed08bc01de3d47ee042fd2e08bdbb0d /numpy/oldnumeric/misc.py | |
| parent | 98940062227b324d22dc2b81b9a4814dd9acfc57 (diff) | |
| download | numpy-310b6d0be5f3277a4bb233564e2b476b676ad646.tar.gz | |
Switch order of .put arguments to match the function call. Eliminate .putmask as a method and make it only a function.
Diffstat (limited to 'numpy/oldnumeric/misc.py')
| -rw-r--r-- | numpy/oldnumeric/misc.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py index d7938fcac..eb66e5806 100644 --- a/numpy/oldnumeric/misc.py +++ b/numpy/oldnumeric/misc.py @@ -1,12 +1,12 @@ # Functions that already have the correct syntax or miscellaneous functions -__all__ = ['load', 'sort', 'copy_reg', 'clip', 'putmask', 'Unpickler', 'rank', +__all__ = ['load', 'sort', 'copy_reg', 'clip', 'Unpickler', 'rank', 'sign', 'shape', 'types', 'allclose', 'size', 'choose', 'swapaxes', 'array_str', - 'pi', 'math', 'concatenate', + 'pi', 'math', 'concatenate', 'putmask', 'put', 'around', 'vdot', 'transpose', 'array2string', 'diagonal', - 'searchsorted', 'put', 'fromfunction', 'copy', 'resize', + 'searchsorted', 'fromfunction', 'copy', 'resize', 'array_repr', 'e', 'StringIO', 'pickle', 'argsort', 'convolve', 'loads', 'cross_correlate', 'Pickler', 'dot', 'outerproduct', 'innerproduct', 'insert'] @@ -19,10 +19,10 @@ import copy import copy_reg from pickle import load, loads -from numpy import sort, clip, putmask, rank, sign, shape, allclose, size,\ - choose, swapaxes, array_str, array_repr, e, pi, \ +from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\ + choose, swapaxes, array_str, array_repr, e, pi, put, \ fromfunction, resize, around, concatenate, vdot, transpose, \ - diagonal, searchsorted, put, argsort, convolve, dot, \ + diagonal, searchsorted, argsort, convolve, dot, \ outer as outerproduct, inner as innerproduct, correlate as cross_correlate, \ place as insert |