diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-28 19:46:08 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-28 19:46:08 +0000 |
| commit | 0f23250d0f7f84f1c69ccd85d13338714343d4c1 (patch) | |
| tree | 48d8356353a0738a31a8a73fb55241c03bfd8471 /numpy/oldnumeric/misc.py | |
| parent | 59286e9133cfc1d71b92313e0b0443e31f03e8ce (diff) | |
| download | numpy-0f23250d0f7f84f1c69ccd85d13338714343d4c1.tar.gz | |
Merge changes mistakenly added to 1.0b4 tag to the main trunk
Diffstat (limited to 'numpy/oldnumeric/misc.py')
| -rw-r--r-- | numpy/oldnumeric/misc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py index a6c13d780..d7938fcac 100644 --- a/numpy/oldnumeric/misc.py +++ b/numpy/oldnumeric/misc.py @@ -9,7 +9,7 @@ __all__ = ['load', 'sort', 'copy_reg', 'clip', 'putmask', 'Unpickler', 'rank', 'searchsorted', 'put', 'fromfunction', 'copy', 'resize', 'array_repr', 'e', 'StringIO', 'pickle', 'argsort', 'convolve', 'loads', 'cross_correlate', - 'Pickler', 'dot', 'outerproduct', 'innerproduct'] + 'Pickler', 'dot', 'outerproduct', 'innerproduct', 'insert'] import types import StringIO @@ -23,7 +23,8 @@ 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, argsort, convolve, dot, \ - outer as outerproduct, inner as innerproduct, correlate as cross_correlate + outer as outerproduct, inner as innerproduct, correlate as cross_correlate, \ + place as insert from array_printer import array2string |