diff options
author | rgommers <ralf.gommers@googlemail.com> | 2011-03-07 08:59:38 +0800 |
---|---|---|
committer | rgommers <ralf.gommers@googlemail.com> | 2011-03-11 12:27:02 +0800 |
commit | f791984cf1d8aedaeaf4fa36db539744d88de051 (patch) | |
tree | 93f5356d41ce4ba8e12c434591da5614dab9f196 | |
parent | a4fed55568a7bcc92bca0c3513e4c37dd5a47348 (diff) | |
download | numpy-f791984cf1d8aedaeaf4fa36db539744d88de051.tar.gz |
DEP: remove deprecated names in fftpack.
-rwxr-xr-x | doc/summarize.py | 21 | ||||
-rw-r--r-- | numpy/fft/fftpack.py | 12 |
2 files changed, 11 insertions, 22 deletions
diff --git a/doc/summarize.py b/doc/summarize.py index e49df4838..f1888e046 100755 --- a/doc/summarize.py +++ b/doc/summarize.py @@ -42,7 +42,6 @@ random random.info random.mtrand random.ranf random.sample random.random # --- numpy.fft: fft fft.Tester fft.bench fft.fftpack fft.fftpack_lite fft.helper -fft.refft fft.refft2 fft.refftn fft.irefft fft.irefft2 fft.irefftn fft.info fft.test # --- numpy.linalg: @@ -67,10 +66,10 @@ def main(): fn = os.path.join(CUR_DIR, 'dump.xml') if os.path.isfile(fn): import_phantom_module(fn) - + # check documented, undocumented = check_numpy() - + # report in_sections = {} for name, locations in documented.iteritems(): @@ -108,7 +107,7 @@ def check_numpy(): if k.startswith('numpy.'): d[k[6:]] = d[k] del d[k] - + return documented, undocumented def get_undocumented(documented, module, module_name=None, skip=[]): @@ -123,24 +122,24 @@ def get_undocumented(documented, module, module_name=None, skip=[]): """ undocumented = {} - + if module_name is None: module_name = module.__name__ - + for name in dir(module): obj = getattr(module, name) if name.startswith('_'): continue - + full_name = '.'.join([module_name, name]) if full_name in skip: continue if full_name.startswith('numpy.') and full_name[6:] in skip: continue if not (inspect.ismodule(obj) or callable(obj) or inspect.isclass(obj)): continue - + if full_name not in documented: undocumented[full_name] = True - + return undocumented def format_in_columns(lst, max_columns): @@ -160,9 +159,9 @@ def format_in_columns(lst, max_columns): nrows = len(lst)//ncols else: nrows = 1 + len(lst)//ncols - + fmt = ' %%-%ds ' % (col_len-2) - + lines = [] for n in range(nrows): lines.append("".join([fmt % x for x in lst[n::nrows]])) diff --git a/numpy/fft/fftpack.py b/numpy/fft/fftpack.py index 52cd1ae0c..7f9ee57fd 100644 --- a/numpy/fft/fftpack.py +++ b/numpy/fft/fftpack.py @@ -31,8 +31,7 @@ version of the FFTPACK routines. """ __all__ = ['fft','ifft', 'rfft', 'irfft', 'hfft', 'ihfft', 'rfftn', - 'irfftn', 'rfft2', 'irfft2', 'fft2', 'ifft2', 'fftn', 'ifftn', - 'refft', 'irefft','refftn','irefftn', 'refft2', 'irefft2'] + 'irfftn', 'rfft2', 'irfft2', 'fft2', 'ifft2', 'fftn', 'ifftn'] from numpy.core import asarray, zeros, swapaxes, shape, conjugate, \ take @@ -1114,12 +1113,3 @@ def irfft2(a, s=None, axes=(-2,-1)): """ return irfftn(a, s, axes) - -# Deprecated names -from numpy import deprecate -refft = deprecate(rfft, 'refft', 'rfft') -irefft = deprecate(irfft, 'irefft', 'irfft') -refft2 = deprecate(rfft2, 'refft2', 'rfft2') -irefft2 = deprecate(irfft2, 'irefft2', 'irfft2') -refftn = deprecate(rfftn, 'refftn', 'rfftn') -irefftn = deprecate(irfftn, 'irefftn', 'irfftn') |