Changed how to get dual numpy/scipy behavior. Use explicit numpy.dual module.

3 files changed, 37 insertions, 31 deletions

diff --git a/numpy/dft/__init__.py b/numpy/dft/__init__.py
index 8bfb2d021..236aefdcb 100644
--- a/numpy/dft/__init__.py
+++ b/numpy/dft/__init__.py
@@ -4,18 +4,5 @@ from info import __doc__
 from fftpack import *
 from helper import *
 
-# re-define duplicated functions if full numpy installed.
-try:
-    import scipy.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
-
 from numpy.testing import ScipyTest 
 test = ScipyTest().test
diff --git a/numpy/dual.py b/numpy/dual.py
new file mode 100644
index 000000000..44b7b51c4
--- /dev/null
+++ b/numpy/dual.py
@@ -0,0 +1,37 @@
+# This module should be used for functions both in numpy and scipy if
+#  you want to use the numpy version if available but the scipy version
+#  otherwise.
+#  Usage  --- import numpy.dual
+
+__all__ = ['fft','ifft','fftn','ifftn','fft2','ifft2',
+           'inv','svd','solve','det','eig','eigvals','lstsq',
+           'pinv','cholesky']
+
+try:
+    import scipy.linalg as linpkg
+except ImportError:
+    import numpy.linalg as linpkg
+
+try:
+    import scipy.fftpack as fftpkg
+except ImportError:
+    import numpy.dft as fftpkg
+
+
+fft = fftpkg.fft
+ifft = fftpkg.ifft
+fftn = fftpkg.fftn
+ifftn = fftpkg.ifftn
+fft2 = fftpkg.fft2
+ifft2 = fftpkg.ifft2
+
+inv = linpkg.inv
+svd = linpkg.svd
+solve = linpkg.solve
+det = linpkg.det
+eig = linpkg.eig
+eigvals = linpkg.eigvals
+lstsq = linpkg.lstsq
+pinv = linpkg.pinv
+cholesky = linpkg.cholesky
+    
diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py
index 905495750..42df37663 100644
--- a/numpy/linalg/__init__.py
+++ b/numpy/linalg/__init__.py
@@ -3,23 +3,5 @@ from info import __doc__
 
 from linalg import *
 
-# re-define duplicated functions if full scipy installed.
-try:
-    import scipy.linalg
-except ImportError:
-    pass
-else:
-    inv = scipy.linalg.inv
-    svd = scipy.linalg.svd
-    solve = scipy.linalg.solve
-    det = scipy.linalg.det
-    eig = scipy.linalg.eig
-    eigvals = scipy.linalg.eigvals
-    lstsq = scipy.linalg.lstsq
-    pinv = scipy.linalg.pinv
-    cholesky = scipy.linalg.cholesky
-    
-
-
 from numpy.testing import ScipyTest 
 test = ScipyTest().test