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/core/numeric.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/core/numeric.py')
-rw-r--r-- | numpy/core/numeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index d9959a167..19f0c1fb5 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -14,7 +14,7 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'ufunc', 'fromiter', 'array_equal', 'array_equiv', 'indices', 'fromfunction', 'load', 'loads', 'isscalar', 'binary_repr', 'base_repr', - 'ones', 'identity', 'allclose', 'compare_chararrays', + 'ones', 'identity', 'allclose', 'compare_chararrays', 'putmask', 'seterr', 'geterr', 'setbufsize', 'getbufsize', 'seterrcall', 'geterrcall', 'flatnonzero', 'Inf', 'inf', 'infty', 'Infinity', @@ -120,7 +120,7 @@ set_numeric_ops = multiarray.set_numeric_ops can_cast = multiarray.can_cast lexsort = multiarray.lexsort compare_chararrays = multiarray.compare_chararrays - +putmask = multiarray.putmask def asarray(a, dtype=None, order=None): """Returns a as an array. |