Changed all references to scipy to numpy

42 files changed, 145 insertions, 145 deletions

diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py
index 08cd57559..11657f981 100644
--- a/numpy/distutils/__init__.py
+++ b/numpy/distutils/__init__.py
@@ -12,5 +12,5 @@ except ImportError:
     _INSTALLED = False
 
 if _INSTALLED:
-    from scipy.testing import ScipyTest 
+    from numpy.testing import ScipyTest 
     test = ScipyTest().test
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
index 2e06e6993..0a4e206fd 100644
--- a/numpy/distutils/ccompiler.py
+++ b/numpy/distutils/ccompiler.py
@@ -249,7 +249,7 @@ def new_compiler (plat=None,
                   verbose=0,
                   dry_run=0,
                   force=0):
-    # Try first C compilers from scipy.distutils.
+    # Try first C compilers from numpy.distutils.
     if plat is None:
         plat = os.name
     try:
@@ -261,11 +261,11 @@ def new_compiler (plat=None,
         if compiler is not None:
             msg = msg + " with '%s' compiler" % compiler
         raise DistutilsPlatformError, msg
-    module_name = "scipy.distutils." + module_name
+    module_name = "numpy.distutils." + module_name
     try:
         __import__ (module_name)
     except ImportError, msg:
-        print msg,'in scipy.distutils, trying from distutils..'
+        print msg,'in numpy.distutils, trying from distutils..'
         module_name = module_name[6:]
         try:
             __import__(module_name)
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py
index 7f7c54d8d..3d278249e 100644
--- a/numpy/distutils/command/build_clib.py
+++ b/numpy/distutils/command/build_clib.py
@@ -10,9 +10,9 @@ from types import *
 from distutils.command.build_clib import build_clib as old_build_clib
 from distutils.command.build_clib import show_compilers
 
-from scipy.distutils import log
+from numpy.distutils import log
 from distutils.dep_util import newer_group
-from scipy.distutils.misc_util import filter_sources, has_f_sources,\
+from numpy.distutils.misc_util import filter_sources, has_f_sources,\
      has_cxx_sources, all_strings, get_lib_source_files
 
 class build_clib(old_build_clib):
@@ -71,7 +71,7 @@ class build_clib(old_build_clib):
         self.compiler.show_customization()
 
         if self.have_f_sources():
-            from scipy.distutils.fcompiler import new_fcompiler
+            from numpy.distutils.fcompiler import new_fcompiler
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            verbose=self.verbose,
                                            dry_run=self.dry_run,
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index 7a2318b70..a7703ea7c 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -10,10 +10,10 @@ from types import *
 from distutils.dep_util import newer_group, newer
 from distutils.command.build_ext import build_ext as old_build_ext
 
-from scipy.distutils import log
-from scipy.distutils.misc_util import filter_sources, has_f_sources, \
+from numpy.distutils import log
+from numpy.distutils.misc_util import filter_sources, has_f_sources, \
      has_cxx_sources, get_ext_source_files, all_strings, \
-     get_scipy_include_dirs
+     get_numpy_include_dirs
 from distutils.errors import DistutilsFileError
 
 class build_ext (old_build_ext):
@@ -90,7 +90,7 @@ class build_ext (old_build_ext):
  
         # Initialize Fortran/C++ compilers if needed.
         if need_f_compiler:
-            from scipy.distutils.fcompiler import new_fcompiler
+            from numpy.distutils.fcompiler import new_fcompiler
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            verbose=self.verbose,
                                            dry_run=self.dry_run,
@@ -173,7 +173,7 @@ class build_ext (old_build_ext):
         kws = {'depends':ext.depends}
         output_dir = self.build_temp
 
-        include_dirs = ext.include_dirs + get_scipy_include_dirs()
+        include_dirs = ext.include_dirs + get_numpy_include_dirs()
 
         c_objects = []
         if c_sources:
diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py
index a2dabfa6a..9a8a6bfa8 100644
--- a/numpy/distutils/command/build_scripts.py
+++ b/numpy/distutils/command/build_scripts.py
@@ -2,7 +2,7 @@
 """
 
 from distutils.command.build_scripts import build_scripts as old_build_scripts
-from scipy.distutils import log
+from numpy.distutils import log
 
 class build_scripts(old_build_scripts):
 
@@ -40,5 +40,5 @@ class build_scripts(old_build_scripts):
         return old_build_scripts.run(self)
 
     def get_source_files(self):
-        from scipy.distutils.misc_util import get_script_files
+        from numpy.distutils.misc_util import get_script_files
         return get_script_files(self.scripts)
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py
index 65b46d173..84cf88b96 100644
--- a/numpy/distutils/command/build_src.py
+++ b/numpy/distutils/command/build_src.py
@@ -10,13 +10,13 @@ from distutils.command import build_ext, build_py
 from distutils.util import convert_path
 from distutils.dep_util import newer_group, newer
 
-from scipy.distutils import log
-from scipy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\
+from numpy.distutils import log
+from numpy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\
      appendpath
-from scipy.distutils.from_template import process_file as process_f_file
-from scipy.distutils.conv_template import process_file as process_c_file
-from scipy.distutils.extension import Extension
-from scipy.distutils.system_info import get_info, dict_append
+from numpy.distutils.from_template import process_file as process_f_file
+from numpy.distutils.conv_template import process_file as process_c_file
+from numpy.distutils.extension import Extension
+from numpy.distutils.system_info import get_info, dict_append
 
 class build_src(build_ext.build_ext):
 
@@ -334,7 +334,7 @@ class build_src(build_ext.build_ext):
             if (self.force or newer_group(depends, target_file,'newer')) \
                    and not skip_f2py:
                 log.info("f2py: %s" % (source))
-                import scipy.f2py as f2py2e
+                import numpy.f2py as f2py2e
                 f2py2e.run_main(f2py_options + ['--build-dir',target_dir,source])
             else:
                 log.debug("  skipping '%s' f2py interface (up-to-date)" % (source))
@@ -349,7 +349,7 @@ class build_src(build_ext.build_ext):
             depends = f_sources + extension.depends
             if (self.force or newer_group(depends, target_file, 'newer')) \
                    and not skip_f2py:
-                import scipy.f2py as f2py2e
+                import numpy.f2py as f2py2e
                 log.info("f2py:> %s" % (target_file))
                 self.mkpath(target_dir)
                 f2py2e.run_main(f2py_options + ['--lower',
@@ -371,7 +371,7 @@ class build_src(build_ext.build_ext):
             extension.include_dirs.append(self.build_src)
 
         if not skip_f2py:
-            import scipy.f2py as f2py2e
+            import numpy.f2py as f2py2e
             d = os.path.dirname(f2py2e.__file__)
             source_c = os.path.join(d,'src','fortranobject.c')
             source_h = os.path.join(d,'src','fortranobject.h')
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index aff79067e..fed3a97e5 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -28,7 +28,7 @@ class config(old_config):
 
     def _check_compiler (self):
         old_config._check_compiler(self)
-        from scipy.distutils.fcompiler import FCompiler, new_fcompiler
+        from numpy.distutils.fcompiler import FCompiler, new_fcompiler
         if not isinstance(self.fcompiler, FCompiler):
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            dry_run=self.dry_run, force=1)
diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py
index 0db601fc6..c6073e77b 100644
--- a/numpy/distutils/command/config_compiler.py
+++ b/numpy/distutils/command/config_compiler.py
@@ -44,7 +44,7 @@ class config_fc(Command):
 
     def finalize_options(self):
         if self.help_fcompiler:
-            from scipy.distutils.fcompiler import show_fcompilers
+            from numpy.distutils.fcompiler import show_fcompilers
             show_fcompilers(self.distribution)
             sys.exit()
         return
diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py
index 043f024f5..6512d5103 100644
--- a/numpy/distutils/command/install_headers.py
+++ b/numpy/distutils/command/install_headers.py
@@ -13,8 +13,8 @@ class install_headers (old_install_headers):
         for header in headers:
             if isinstance(header,tuple):
                 # Kind of a hack, but I don't know where else to change this...
-                if header[0] == 'scipy.base':
-                    header = ('scipy', header[1])
+                if header[0] == 'numpy.base':
+                    header = ('numpy', header[1])
                     if os.path.splitext(header[1])[1] == '.inc':
                         continue
                 d = os.path.join(*([prefix]+header[0].split('.')))
diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py
index 289bd0357..a02bdbe45 100644
--- a/numpy/distutils/command/sdist.py
+++ b/numpy/distutils/command/sdist.py
@@ -1,7 +1,7 @@
 
 from distutils.command.sdist import *
 from distutils.command.sdist import sdist as old_sdist
-from scipy.distutils.misc_util import get_data_files
+from numpy.distutils.misc_util import get_data_files
 
 class sdist(old_sdist):
 
diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py
index 842a94756..724e1517f 100644
--- a/numpy/distutils/core.py
+++ b/numpy/distutils/core.py
@@ -10,23 +10,23 @@ except ImportError:
     from distutils.core import setup as old_setup
     have_setuptools = 0
 
-from scipy.distutils.extension import Extension
-from scipy.distutils.command import config
-from scipy.distutils.command import build
-from scipy.distutils.command import build_py
-from scipy.distutils.command import config_compiler
-from scipy.distutils.command import build_ext
-from scipy.distutils.command import build_clib
-from scipy.distutils.command import build_src
-from scipy.distutils.command import build_scripts
-from scipy.distutils.command import sdist
-from scipy.distutils.command import install_data
-from scipy.distutils.command import install_headers
-from scipy.distutils.command import install
-from scipy.distutils.command import bdist_rpm
-from scipy.distutils.misc_util import get_data_files
+from numpy.distutils.extension import Extension
+from numpy.distutils.command import config
+from numpy.distutils.command import build
+from numpy.distutils.command import build_py
+from numpy.distutils.command import config_compiler
+from numpy.distutils.command import build_ext
+from numpy.distutils.command import build_clib
+from numpy.distutils.command import build_src
+from numpy.distutils.command import build_scripts
+from numpy.distutils.command import sdist
+from numpy.distutils.command import install_data
+from numpy.distutils.command import install_headers
+from numpy.distutils.command import install
+from numpy.distutils.command import bdist_rpm
+from numpy.distutils.misc_util import get_data_files
 
-scipy_cmdclass = {'build':            build.build,
+numpy_cmdclass = {'build':            build.build,
                   'build_src':        build_src.build_src,
                   'build_scripts':    build_scripts.build_scripts,
                   'config_fc':        config_compiler.config_fc,
@@ -42,14 +42,14 @@ scipy_cmdclass = {'build':            build.build,
                   }
 if have_setuptools:
     from setuptools.command import bdist_egg, develop, easy_install, egg_info
-    scipy_cmdclass['bdist_egg'] = bdist_egg.bdist_egg
-    scipy_cmdclass['develop'] = develop.develop
-    scipy_cmdclass['easy_install'] = easy_install.easy_install
-    scipy_cmdclass['egg_info'] = egg_info.egg_info
+    numpy_cmdclass['bdist_egg'] = bdist_egg.bdist_egg
+    numpy_cmdclass['develop'] = develop.develop
+    numpy_cmdclass['easy_install'] = easy_install.easy_install
+    numpy_cmdclass['egg_info'] = egg_info.egg_info
 
 def setup(**attr):
 
-    cmdclass = scipy_cmdclass.copy()
+    cmdclass = numpy_cmdclass.copy()
 
     new_attr = attr.copy()
     if new_attr.has_key('cmdclass'):
diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py
index a1cab52f4..2db62969e 100644
--- a/numpy/distutils/extension.py
+++ b/numpy/distutils/extension.py
@@ -53,7 +53,7 @@ class Extension(old_Extension):
         self.depends = depends or []
         self.language = language
 
-        # scipy_distutils features
+        # numpy_distutils features
         self.f2py_options = f2py_options or []
         self.module_dirs = module_dirs or []
 
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()
diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py
index 87b7f564b..f7908bbe9 100644
--- a/numpy/distutils/intelccompiler.py
+++ b/numpy/distutils/intelccompiler.py
@@ -1,7 +1,7 @@
 
 import os
 from distutils.unixccompiler import UnixCCompiler
-from scipy.distutils.exec_command import find_executable
+from numpy.distutils.exec_command import find_executable
 
 class IntelCCompiler(UnixCCompiler):
 
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index fe7b4bd98..d725872f0 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -13,17 +13,17 @@ import sys
 import log
 
 # Overwrite certain distutils.ccompiler functions:
-import scipy.distutils.ccompiler
+import numpy.distutils.ccompiler
 
 # NT stuff
 # 1. Make sure libpython<version>.a exists for gcc.  If not, build it.
 # 2. Force windows to use gcc (we're struggling with MSVC and g77 support) 
-#    --> this is done in scipy/distutils/ccompiler.py
+#    --> this is done in numpy/distutils/ccompiler.py
 # 3. Force windows to use g77
 
 import distutils.cygwinccompiler
 from distutils.version import StrictVersion
-from scipy.distutils.ccompiler import gen_preprocess_options, gen_lib_options
+from numpy.distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 
 from distutils.unixccompiler import UnixCCompiler 
@@ -197,7 +197,7 @@ def build_import_library():
         return
     log.info('Building import library: "%s"' % (out_file))
 
-    from scipy.distutils import lib2def
+    from numpy.distutils import lib2def
 
     def_name = "python%d%d.def" % tuple(sys.version_info[:2])    
     def_file = os.path.join(sys.prefix,'libs',def_name)
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index f94220c74..7c5045d62 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -273,7 +273,7 @@ class Configuration:
                   'libraries','headers','scripts']
     _dict_keys = ['package_dir']
 
-    scipy_include_dirs = []
+    numpy_include_dirs = []
 
     def __init__(self,
                  package_name=None,
@@ -615,7 +615,7 @@ class Configuration:
 
         ext_args['libraries'] = libnames + ext_args['libraries']
 
-        from scipy.distutils.core import Extension
+        from numpy.distutils.core import Extension
         ext = Extension(**ext_args)
         self.ext_modules.append(ext)
 
@@ -739,7 +739,7 @@ class Configuration:
                         libraries=self.libraries,
                         include_dirs=self.include_dirs)
         else:
-            from scipy.distutils.core import Extension
+            from numpy.distutils.core import Extension
             assert isinstance(extlib,Extension),`extlib`
             extlib.libraries.extend(self.libraries)
             extlib.include_dirs.extend(self.include_dirs)
@@ -860,20 +860,20 @@ def get_cmd(cmdname,_cache={}):
         _cache[cmdname] = cmd
     return _cache[cmdname]
 
-def get_scipy_include_dirs():
-    # scipy_include_dirs are set by scipy/base/setup.py, otherwise []
-    include_dirs = Configuration.scipy_include_dirs[:]
+def get_numpy_include_dirs():
+    # numpy_include_dirs are set by numpy/base/setup.py, otherwise []
+    include_dirs = Configuration.numpy_include_dirs[:]
     if not include_dirs:
-        import scipy
-        if scipy.show_core_config is None:
-            # running from scipy_core source directory
-            include_dirs.append(os.path.join(os.path.dirname(scipy.__file__),
+        import numpy
+        if numpy.show_core_config is None:
+            # running from numpy_core source directory
+            include_dirs.append(os.path.join(os.path.dirname(numpy.__file__),
                                              'base','include'))
         else:
-            # using installed scipy core headers
-            import scipy.base as base
+            # using installed numpy core headers
+            import numpy.base as base
             include_dirs.append(os.path.join(os.path.dirname(base.__file__),'include'))
-    # else running scipy/base/setup.py
+    # else running numpy/base/setup.py
     return include_dirs
 
 #########################
@@ -929,7 +929,7 @@ def generate_config_py(extension, build_dir):
                         sources=[generate_config_py])
         config['ext_modules'].append(ext)
     """
-    from scipy.distutils.system_info import system_info
+    from numpy.distutils.system_info import system_info
     from distutils.dir_util import mkpath
     target = os.path.join(*([build_dir]+extension.name.split('.'))) + '.py'
     mkpath(os.path.dirname(target))
diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py
index 8fe472eaf..f093bdc19 100644
--- a/numpy/distutils/setup.py
+++ b/numpy/distutils/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-from scipy.distutils.core      import setup
-from scipy.distutils.misc_util import Configuration
+from numpy.distutils.core      import setup
+from numpy.distutils.misc_util import Configuration
 
 def configuration(parent_package='',top_path=None):
     config = Configuration('distutils',parent_package,top_path)
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index f0cfff1d0..22d1e210d 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -22,7 +22,7 @@ classes are available:
   blas_src_info
   numpy_info
   numarray_info
-  scipy_info
+  numpy_info
   boost_python_info
   agg2_info
   wx_info
@@ -175,7 +175,7 @@ def get_info(name,notfound_action=0):
           'numpy':numpy_info,
           'numeric':numpy_info, # alias to numpy, for build_ext --backends support
           'numarray':numarray_info,
-          'scipy':scipy_info,
+          'numpy':numpy_info,
           'lapack_opt':lapack_opt_info,
           'blas_opt':blas_opt_info,
           'boost_python':boost_python_info,
@@ -206,49 +206,49 @@ class AtlasNotFoundError(NotFoundError):
     """
     Atlas (http://math-atlas.sourceforge.net/) libraries not found.
     Directories to search for the libraries can be specified in the
-    scipy_distutils/site.cfg file (section [atlas]) or by setting
+    numpy_distutils/site.cfg file (section [atlas]) or by setting
     the ATLAS environment variable."""
 
 class LapackNotFoundError(NotFoundError):
     """
     Lapack (http://www.netlib.org/lapack/) libraries not found.
     Directories to search for the libraries can be specified in the
-    scipy_distutils/site.cfg file (section [lapack]) or by setting
+    numpy_distutils/site.cfg file (section [lapack]) or by setting
     the LAPACK environment variable."""
 
 class LapackSrcNotFoundError(LapackNotFoundError):
     """
     Lapack (http://www.netlib.org/lapack/) sources not found.
     Directories to search for the sources can be specified in the
-    scipy_distutils/site.cfg file (section [lapack_src]) or by setting
+    numpy_distutils/site.cfg file (section [lapack_src]) or by setting
     the LAPACK_SRC environment variable."""
 
 class BlasNotFoundError(NotFoundError):
     """
     Blas (http://www.netlib.org/blas/) libraries not found.
     Directories to search for the libraries can be specified in the
-    scipy_distutils/site.cfg file (section [blas]) or by setting
+    numpy_distutils/site.cfg file (section [blas]) or by setting
     the BLAS environment variable."""
 
 class BlasSrcNotFoundError(BlasNotFoundError):
     """
     Blas (http://www.netlib.org/blas/) sources not found.
     Directories to search for the sources can be specified in the
-    scipy_distutils/site.cfg file (section [blas_src]) or by setting
+    numpy_distutils/site.cfg file (section [blas_src]) or by setting
     the BLAS_SRC environment variable."""
 
 class FFTWNotFoundError(NotFoundError):
     """
     FFTW (http://www.fftw.org/) libraries not found.
     Directories to search for the libraries can be specified in the
-    scipy_distutils/site.cfg file (section [fftw]) or by setting
+    numpy_distutils/site.cfg file (section [fftw]) or by setting
     the FFTW environment variable."""
 
 class DJBFFTNotFoundError(NotFoundError):
     """
     DJBFFT (http://cr.yp.to/djbfft.html) libraries not found.
     Directories to search for the libraries can be specified in the
-    scipy_distutils/site.cfg file (section [djbfft]) or by setting
+    numpy_distutils/site.cfg file (section [djbfft]) or by setting
     the DJBFFT environment variable."""
 
 class F2pyNotFoundError(NotFoundError):
@@ -331,7 +331,7 @@ class system_info:
 
     def get_info(self,notfound_action=0):
         """ Return a dictonary with items that are compatible
-            with scipy_distutils.setup keyword arguments.
+            with numpy_distutils.setup keyword arguments.
         """
         flag = 0
         if not self.has_info():
@@ -786,7 +786,7 @@ class atlas_info(system_info):
       size of %s is %sk (expected >4000k)
 
     Follow the instructions in the KNOWN PROBLEMS section of the file
-    scipy/INSTALL.txt.
+    numpy/INSTALL.txt.
 *********************************************************************
 """ % (lapack_lib,sz/1024)
                 warnings.warn(message)
@@ -956,7 +956,7 @@ class lapack_src_info(system_info):
         self.set_info(**info)
 
 atlas_version_c_text = r'''
-/* This file is generated from scipy_distutils/system_info.py */
+/* This file is generated from numpy_distutils/system_info.py */
 #ifdef __CPLUSPLUS__
 extern "C" {
 #endif
@@ -1360,9 +1360,9 @@ class numarray_info(numpy_info):
     section = 'numarray'
     modulename = 'numarray'
 
-class scipy_info(numpy_info):
-    section = 'scipy'
-    modulename = 'scipy'
+class numpy_info(numpy_info):
+    section = 'numpy'
+    modulename = 'numpy'
 
 
 class boost_python_info(system_info):
diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py
index 6b786a97e..1c1ca955b 100644
--- a/numpy/distutils/tests/f2py_ext/setup.py
+++ b/numpy/distutils/tests/f2py_ext/setup.py
@@ -1,6 +1,6 @@
 
 import os
-from scipy.distutils.core import setup, Extension
+from numpy.distutils.core import setup, Extension
 
 ext = Extension('f2py_ext.fib2',['src/fib2.pyf','src/fib1.f'])
 
diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
index 633e2ba20..8c89db7cc 100644
--- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
+++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
@@ -1,5 +1,5 @@
 import sys
-from scipy.base.testing import *
+from numpy.base.testing import *
 set_package_path()
 from f2py_ext import fib2
 del sys.path[0]
diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py
index f3ab45045..f892a5738 100644
--- a/numpy/distutils/tests/f2py_f90_ext/setup.py
+++ b/numpy/distutils/tests/f2py_f90_ext/setup.py
@@ -1,6 +1,6 @@
 
 import os
-from scipy_distutils.core import setup, Extension
+from numpy_distutils.core import setup, Extension
 
 package = 'f2py_f90_ext'
 
diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
index 544f94ab4..609164386 100644
--- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
+++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
@@ -1,5 +1,5 @@
 import sys
-from scipy.base.testing import *
+from numpy.base.testing import *
 set_package_path()
 from f2py_f90_ext import foo
 del sys.path[0]
diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py
index 7b12c1f55..c8b6ddee2 100644
--- a/numpy/distutils/tests/gen_ext/setup.py
+++ b/numpy/distutils/tests/gen_ext/setup.py
@@ -1,6 +1,6 @@
 
 import os
-from scipy.distutils.core import setup, Extension
+from numpy.distutils.core import setup, Extension
 from distutils.dep_util import newer
 
 fib3_f = '''
diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
index c8ee2441c..39b3e3cc4 100644
--- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py
+++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
@@ -1,5 +1,5 @@
 import sys
-from scipy.base.testing import *
+from numpy.base.testing import *
 set_package_path()
 from gen_ext import fib3
 del sys.path[0]
diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py
index b6fe8eed4..65b2f6e2a 100644
--- a/numpy/distutils/tests/swig_ext/setup.py
+++ b/numpy/distutils/tests/swig_ext/setup.py
@@ -1,6 +1,6 @@
 
 import os
-from scipy_distutils.core import setup, Extension
+from numpy_distutils.core import setup, Extension
 
 ext_c = Extension('swig_ext._example',['src/example.i','src/example.c'])
 ext_cpp = Extension('swig_ext._example2',['src/zoo.i','src/zoo.cc'],
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index baedec642..4d8e81b49 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -1,5 +1,5 @@
 import sys
-from scipy.base.testing import *
+from numpy.base.testing import *
 set_package_path()
 from swig_ext import example
 del sys.path[0]
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py
index af066be68..558d0d44a 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example2.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py
@@ -1,5 +1,5 @@
 import sys
-from scipy.base.testing import *
+from numpy.base.testing import *
 set_package_path()
 from swig_ext import example2
 del sys.path[0]
diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py
index 4ca21ea13..d1d53033c 100644
--- a/numpy/distutils/tests/test_misc_util.py
+++ b/numpy/distutils/tests/test_misc_util.py
@@ -1,6 +1,6 @@
 import sys
-from scipy.testing import *
-from scipy.distutils.misc_util import appendpath
+from numpy.testing import *
+from numpy.distutils.misc_util import appendpath
 from os.path import join, sep
 
 ajoin = lambda *paths: join(*((sep,)+paths))