Changed all references to scipy to numpy

15 files changed, 48 insertions, 48 deletions

diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py
index f7cbc3bad..c13884aa6 100644
--- a/numpy/distutils/fcompiler/__init__.py
+++ b/numpy/distutils/fcompiler/__init__.py
@@ -1,7 +1,7 @@
-"""scipy.distutils.fcompiler
+"""numpy.distutils.fcompiler
 
 Contains FCompiler, an abstract base class that defines the interface
-for the scipy.distutils Fortran compiler abstraction model.
+for the numpy.distutils Fortran compiler abstraction model.
 """
 
 __all__ = ['FCompiler','new_fcompiler','show_fcompilers',
@@ -17,9 +17,9 @@ from distutils.errors import DistutilsModuleError,DistutilsArgError,\
      DistutilsExecError,CompileError,LinkError,DistutilsPlatformError
 from distutils.util import split_quoted
 
-from scipy.distutils.ccompiler import CCompiler, gen_lib_options
-from scipy.distutils import log
-from scipy.distutils.command.config_compiler import config_fc
+from numpy.distutils.ccompiler import CCompiler, gen_lib_options
+from numpy.distutils import log
+from numpy.distutils.command.config_compiler import config_fc
 from distutils.spawn import _nt_quote_args
 
 class FCompiler(CCompiler):
@@ -636,7 +636,7 @@ def new_fcompiler(plat=None,
         raise DistutilsPlatformError, msg
 
     try:
-        module_name = 'scipy.distutils.fcompiler.'+module_name
+        module_name = 'numpy.distutils.fcompiler.'+module_name
         __import__ (module_name)
         module = sys.modules[module_name]
         klass = vars(module)[class_name]
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py
index 51c3548db..31ae2c772 100644
--- a/numpy/distutils/fcompiler/absoft.py
+++ b/numpy/distutils/fcompiler/absoft.py
@@ -9,9 +9,9 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler, dummy_fortran_file
-from scipy.distutils.misc_util import cyg2win32
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file
+from numpy.distutils.misc_util import cyg2win32
 
 class AbsoftFCompiler(FCompiler):
 
@@ -131,7 +131,7 @@ class AbsoftFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='absoft')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py
index 7abb23ae2..36382050a 100644
--- a/numpy/distutils/fcompiler/compaq.py
+++ b/numpy/distutils/fcompiler/compaq.py
@@ -4,8 +4,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class CompaqFCompiler(FCompiler):
 
diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py
index a3bf374a8..247d3f94b 100644
--- a/numpy/distutils/fcompiler/g95.py
+++ b/numpy/distutils/fcompiler/g95.py
@@ -3,8 +3,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class G95FCompiler(FCompiler):
 
@@ -34,7 +34,7 @@ class G95FCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     #compiler = new_fcompiler(compiler='g95')
     compiler = G95FCompiler()
     compiler.customize()
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
index b0072571f..94c5e768d 100644
--- a/numpy/distutils/fcompiler/gnu.py
+++ b/numpy/distutils/fcompiler/gnu.py
@@ -4,9 +4,9 @@ import os
 import sys
 import warnings
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
-from scipy.distutils.exec_command import exec_command, find_executable
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
+from numpy.distutils.exec_command import exec_command, find_executable
 
 class GnuFCompiler(FCompiler):
 
@@ -237,7 +237,7 @@ class Gnu95FCompiler(GnuFCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     #compiler = new_fcompiler(compiler='gnu')
     compiler = GnuFCompiler()
     compiler.customize()
diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py
index 95f326cea..8cab2c611 100644
--- a/numpy/distutils/fcompiler/hpux.py
+++ b/numpy/distutils/fcompiler/hpux.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class HPUXFCompiler(FCompiler):
 
@@ -35,7 +35,7 @@ class HPUXFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(10)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='hpux')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py
index 5fc59d1e6..0468af4cb 100644
--- a/numpy/distutils/fcompiler/ibm.py
+++ b/numpy/distutils/fcompiler/ibm.py
@@ -2,7 +2,7 @@ import os
 import re
 import sys
 
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.fcompiler import FCompiler
 from distutils import log
 
 class IbmFCompiler(FCompiler):
@@ -74,7 +74,7 @@ class IbmFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='ibm')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
index 0e7375943..74bbaf52a 100644
--- a/numpy/distutils/fcompiler/intel.py
+++ b/numpy/distutils/fcompiler/intel.py
@@ -3,9 +3,9 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler, dummy_fortran_file
-from scipy.distutils.exec_command import find_executable
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file
+from numpy.distutils.exec_command import find_executable
 
 class IntelFCompiler(FCompiler):
 
@@ -168,7 +168,7 @@ class IntelItaniumVisualFCompiler(IntelVisualFCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='intel')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py
index 9b88cc264..eaa577b62 100644
--- a/numpy/distutils/fcompiler/lahey.py
+++ b/numpy/distutils/fcompiler/lahey.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class LaheyFCompiler(FCompiler):
 
@@ -40,7 +40,7 @@ class LaheyFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='lahey')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py
index 547e91423..915cbead9 100644
--- a/numpy/distutils/fcompiler/mips.py
+++ b/numpy/distutils/fcompiler/mips.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class MipsFCompiler(FCompiler):
 
@@ -50,7 +50,7 @@ class MipsFCompiler(FCompiler):
         return r
 
 if __name__ == '__main__':
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='mips')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py
index e17d972c4..c0b3b17e9 100644
--- a/numpy/distutils/fcompiler/nag.py
+++ b/numpy/distutils/fcompiler/nag.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class NAGFCompiler(FCompiler):
 
@@ -33,7 +33,7 @@ class NAGFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='nag')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py
index 984ea7dda..c38b9f1ac 100644
--- a/numpy/distutils/fcompiler/none.py
+++ b/numpy/distutils/fcompiler/none.py
@@ -1,5 +1,5 @@
 
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.fcompiler import FCompiler
 
 class NoneFCompiler(FCompiler):
 
@@ -18,7 +18,7 @@ class NoneFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = NoneFCompiler()
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py
index bfdf9752c..94aefa244 100644
--- a/numpy/distutils/fcompiler/pg.py
+++ b/numpy/distutils/fcompiler/pg.py
@@ -4,8 +4,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class PGroupFCompiler(FCompiler):
 
@@ -36,7 +36,7 @@ class PGroupFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='pg')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py
index 0c0599a06..7bfd805ad 100644
--- a/numpy/distutils/fcompiler/sun.py
+++ b/numpy/distutils/fcompiler/sun.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler import FCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler import FCompiler
 
 class SunFCompiler(FCompiler):
 
@@ -41,7 +41,7 @@ class SunFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='sun')
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py
index 1c6b40032..d2977b7e0 100644
--- a/numpy/distutils/fcompiler/vast.py
+++ b/numpy/distutils/fcompiler/vast.py
@@ -1,8 +1,8 @@
 import os
 import sys
 
-from scipy.distutils.cpuinfo import cpu
-from scipy.distutils.fcompiler.gnu import GnuFCompiler
+from numpy.distutils.cpuinfo import cpu
+from numpy.distutils.fcompiler.gnu import GnuFCompiler
 
 class VastFCompiler(GnuFCompiler):
 
@@ -44,7 +44,7 @@ class VastFCompiler(GnuFCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from scipy.distutils.fcompiler import new_fcompiler
+    from numpy.distutils.fcompiler import new_fcompiler
     compiler = new_fcompiler(compiler='vast')
     compiler.customize()
     print compiler.get_version()