summaryrefslogtreecommitdiff
path: root/numpy/dft
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
commite706c7d92c4ee41e8e995fb3838bd0931b57efb5 (patch)
tree015a057d49422774e49ed211a37c14105d03a713 /numpy/dft
parentc14d4fe25cb5cd482369734dd487ac8f376851c9 (diff)
downloadnumpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.gz
Changed all references to scipy to numpy
Diffstat (limited to 'numpy/dft')
-rw-r--r--numpy/dft/__init__.py18
-rw-r--r--numpy/dft/fftpack.py2
-rw-r--r--numpy/dft/fftpack_litemodule.c2
-rw-r--r--numpy/dft/helper.py2
-rw-r--r--numpy/dft/tests/test_helper.py6
5 files changed, 15 insertions, 15 deletions
diff --git a/numpy/dft/__init__.py b/numpy/dft/__init__.py
index 0a72b86bd..b5fde1d36 100644
--- a/numpy/dft/__init__.py
+++ b/numpy/dft/__init__.py
@@ -4,19 +4,19 @@ from info import __doc__
from fftpack import *
from helper import *
-# re-define duplicated functions if full scipy installed.
+# re-define duplicated functions if full numpy installed.
try:
- import scipy.fftpack
+ import numpy.fftpack
except ImportError:
pass
else:
- fft = scipy.fftpack.fft
- ifft = scipy.fftpack.ifft
- fftn = scipy.fftpack.fftn
- ifftn = scipy.fftpack.ifftn
- fft2 = scipy.fftpack.fft2
- ifft2 = scipy.fftpack.ifft2
+ fft = numpy.fftpack.fft
+ ifft = numpy.fftpack.ifft
+ fftn = numpy.fftpack.fftn
+ ifftn = numpy.fftpack.ifftn
+ fft2 = numpy.fftpack.fft2
+ ifft2 = numpy.fftpack.ifft2
-from scipy.testing import ScipyTest
+from numpy.testing import ScipyTest
test = ScipyTest().test
diff --git a/numpy/dft/fftpack.py b/numpy/dft/fftpack.py
index d95c87667..fdaf65bce 100644
--- a/numpy/dft/fftpack.py
+++ b/numpy/dft/fftpack.py
@@ -26,7 +26,7 @@ __all__ = ['fft','inverse_fft', 'ifft', 'real_fft', 'refft', 'inverse_real_fft',
'inverse_fft2d', 'real_fftnd', 'real_fft2d', 'inverse_real_fftnd',
'inverse_real_fft2d',]
-from scipy.base import *
+from numpy.base import *
import fftpack_lite as fftpack
from helper import *
diff --git a/numpy/dft/fftpack_litemodule.c b/numpy/dft/fftpack_litemodule.c
index 692da5e52..4a509d26b 100644
--- a/numpy/dft/fftpack_litemodule.c
+++ b/numpy/dft/fftpack_litemodule.c
@@ -1,6 +1,6 @@
#include "fftpack.h"
#include "Python.h"
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
static PyObject *ErrorObject;
diff --git a/numpy/dft/helper.py b/numpy/dft/helper.py
index 36a9c3dec..d5ed9940b 100644
--- a/numpy/dft/helper.py
+++ b/numpy/dft/helper.py
@@ -5,7 +5,7 @@ Discrete Fourier Transforms - helper.py
__all__ = ['fftshift','ifftshift','fftfreq']
-from scipy.base import asarray, concatenate, arange, take, \
+from numpy.base import asarray, concatenate, arange, take, \
array, integer
import types
diff --git a/numpy/dft/tests/test_helper.py b/numpy/dft/tests/test_helper.py
index f962096f6..e8dd36165 100644
--- a/numpy/dft/tests/test_helper.py
+++ b/numpy/dft/tests/test_helper.py
@@ -4,12 +4,12 @@
"""
import sys
-from scipy.testing import *
+from numpy.testing import *
set_package_path()
-from scipy.corefft import fftshift,ifftshift,fftfreq
+from numpy.corefft import fftshift,ifftshift,fftfreq
del sys.path[0]
-from scipy import pi
+from numpy import pi
def random(size):
return rand(*size)