diff options
| author | Stefan van der Walt <stefan@sun.ac.za> | 2009-10-25 09:01:06 +0000 |
|---|---|---|
| committer | Stefan van der Walt <stefan@sun.ac.za> | 2009-10-25 09:01:06 +0000 |
| commit | 55d07fbe7b06ebe34511d53c4cabab8c9476d0ff (patch) | |
| tree | e47d329d61b283835919218ee87d1e247f119564 /numpy/ma | |
| parent | bbab7a4c2d7b7f5a12c2326ffeb99acd87bbb52e (diff) | |
| download | numpy-55d07fbe7b06ebe34511d53c4cabab8c9476d0ff.tar.gz | |
Merge deprecate_with_doc into deprecate(message="...").
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/extras.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 02bfa3cca..0f0d504c5 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -48,7 +48,7 @@ import numpy.core.umath as umath from numpy.lib.index_tricks import AxisConcatenator from numpy.linalg import lstsq -from numpy.lib.utils import deprecate_with_doc +from numpy.lib.utils import deprecate #............................................................................... def issequence(seq): @@ -1173,7 +1173,7 @@ def setdiff1d(ar1, ar2, assume_unique=False): else: return ma.asarray(ar1)[aux == 0] -@deprecate_with_doc('') +@deprecate def unique1d(ar1, return_index=False, return_inverse=False): """ This function is deprecated. Use ma.unique() instead. """ output = np.unique1d(ar1, @@ -1187,7 +1187,7 @@ def unique1d(ar1, return_index=False, return_inverse=False): output = output.view(MaskedArray) return output -@deprecate_with_doc('') +@deprecate def intersect1d_nu(ar1, ar2): """ This function is deprecated. Use ma.intersect1d() instead.""" # Might be faster than unique1d( intersect1d( ar1, ar2 ) )? @@ -1195,7 +1195,7 @@ def intersect1d_nu(ar1, ar2): aux.sort() return aux[aux[1:] == aux[:-1]] -@deprecate_with_doc('') +@deprecate def setmember1d(ar1, ar2): """ This function is deprecated. Use ma.in1d() instead.""" ar1 = ma.asanyarray(ar1) |