[Scipy-svn] r4370 - in branches/refactor_fft/scipy/fftpack/backends: fftw fftw3 mkl

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-16 02:56:34 -0500 (Fri, 16 May 2008)
New Revision: 4370

Modified:
   branches/refactor_fft/scipy/fftpack/backends/fftw/__init__.py
   branches/refactor_fft/scipy/fftpack/backends/fftw3/__init__.py
   branches/refactor_fft/scipy/fftpack/backends/mkl/__init__.py
Log:
Do not fail backend import because of nosetests.

Modified: branches/refactor_fft/scipy/fftpack/backends/fftw/__init__.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/backends/fftw/__init__.py	2008-05-16 06:46:53 UTC (rev 4369)
+++ branches/refactor_fft/scipy/fftpack/backends/fftw/__init__.py	2008-05-16 07:56:34 UTC (rev 4370)
@@ -1,3 +1,10 @@
-from _fftw import zfft_fftw as zfft, \
-        drfft_fftw as drfft, \
-        zfftnd_fftw as zfftnd
+"""This module should never be imported directly."""
+
+# We wrap around ImportError because nosetest tries to import this
+# module and generates an error when the backend is not built
+try:
+    from _fftw import zfft_fftw as zfft, \
+                      drfft_fftw as drfft, \
+                      zfftnd_fftw as zfftnd
+except ImportError:
+    pass

Modified: branches/refactor_fft/scipy/fftpack/backends/fftw3/__init__.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/backends/fftw3/__init__.py	2008-05-16 06:46:53 UTC (rev 4369)
+++ branches/refactor_fft/scipy/fftpack/backends/fftw3/__init__.py	2008-05-16 07:56:34 UTC (rev 4370)
@@ -1,3 +1,11 @@
-from _fftw3 import zfft_fftw3 as zfft, \
-        drfft_fftw3 as drfft, \
-        zfftnd_fftw3 as zfftnd
+"""This module should never be imported directly."""
+
+# We wrap around ImportError because nosetest tries to import this
+# module and generates an error when the backend is not built
+
+try:
+    from _fftw3 import zfft_fftw3 as zfft, \
+                       drfft_fftw3 as drfft, \
+                       zfftnd_fftw3 as zfftnd
+except ImportError:
+    pass

Modified: branches/refactor_fft/scipy/fftpack/backends/mkl/__init__.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/backends/mkl/__init__.py	2008-05-16 06:46:53 UTC (rev 4369)
+++ branches/refactor_fft/scipy/fftpack/backends/mkl/__init__.py	2008-05-16 07:56:34 UTC (rev 4370)
@@ -1,2 +1,9 @@
-from _mkl import zfft_mkl as zfft, \
-        zfftnd_mkl as zfftnd
+"""This module should never be imported directly."""
+
+# We wrap around ImportError because nosetest tries to import this
+# module and generates an error when the backend is not built
+try:
+    from _mkl import zfft_mkl as zfft, \
+                     zfftnd_mkl as zfftnd
+except ImportError:
+    pass