Changed all references to scipy to numpy

24 files changed, 164 insertions, 164 deletions

diff --git a/numpy/f2py/Makefile b/numpy/f2py/Makefile
index 91c199f99..4e53ac471 100644
--- a/numpy/f2py/Makefile
+++ b/numpy/f2py/Makefile
@@ -8,15 +8,15 @@
 PYTHON=python
 MAJOR=2
 F2PY2E_CVSROOT=:pserver:anonymous@cens.ioc.ee:/home/cvs
-SCIPY_CVSROOT=:pserver:anonymous@scipy.org:/home/cvsroot
+SCIPY_CVSROOT=:pserver:anonymous@numpy.org:/home/cvsroot
 
 UPLOADCMD = scp -r
 UPLOADDIR = pearu@kev.ioc.ee:/net/cens/home/www/unsecure/projects/f2py2e/
 
 REV=`python -c 'from __version__ import *;print version'`
-SCIPY_DISTUTILS_REV=`cd scipy_distutils && $(PYTHON) -c 'from scipy_distutils_version import *;print scipy_distutils_version' && cd ..`
+SCIPY_DISTUTILS_REV=`cd numpy_distutils && $(PYTHON) -c 'from numpy_distutils_version import *;print numpy_distutils_version' && cd ..`
 
-SRC_FILES = F2PY-$(MAJOR)-latest.tar.gz scipy_distutils-latest.tar.gz F2PY-$(MAJOR)-latest.win32.exe scipy_distutils-latest.win32.exe
+SRC_FILES = F2PY-$(MAJOR)-latest.tar.gz numpy_distutils-latest.tar.gz F2PY-$(MAJOR)-latest.win32.exe numpy_distutils-latest.win32.exe
 
 HTML_FILES = index.html FAQ.html HISTORY.html THANKS.html TESTING.html OLDNEWS.html
 FAQ_DEPS = simple.f pytest.py pyforttest.pyf simple_session.dat
@@ -64,25 +64,25 @@ f2py2e_latest: upload/tmp/$(MAJOR).x/F2PY-$(MAJOR)-latest.tar.gz upload/tmp/$(MA
 # Create Scipy_distutils tar-balls
 ##############################################################################
 
-scipy_distutils:
-	test -d scipy_distutils && (cd scipy_distutils && cvs -d $(SCIPY_CVSROOT) -z7 update -Pd && cd -) || cvs -d $(SCIPY_CVSROOT) checkout scipy_distutils
+numpy_distutils:
+	test -d numpy_distutils && (cd numpy_distutils && cvs -d $(SCIPY_CVSROOT) -z7 update -Pd && cd -) || cvs -d $(SCIPY_CVSROOT) checkout numpy_distutils
 
-upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz: scipy_distutils
-	cd scipy_distutils && python setup.py sdist -f
+upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz: numpy_distutils
+	cd numpy_distutils && python setup.py sdist -f
 	mkdir -p upload/tmp/$(MAJOR).x
-	cp scipy_distutils/dist/scipy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz upload/tmp/$(MAJOR).x
-	ln -sf scipy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz scipy_distutils-latest.tar.gz
-	mv scipy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x
-upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe: scipy_distutils
-	cd scipy_distutils && python setup.py bdist_wininst
+	cp numpy_distutils/dist/numpy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz upload/tmp/$(MAJOR).x
+	ln -sf numpy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz numpy_distutils-latest.tar.gz
+	mv numpy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x
+upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe: numpy_distutils
+	cd numpy_distutils && python setup.py bdist_wininst
 	mkdir -p upload/tmp/$(MAJOR).x
-	cp scipy_distutils/dist/scipy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe upload/tmp/$(MAJOR).x
-	ln -sf scipy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe scipy_distutils-latest.win32.exe
-	mv scipy_distutils-latest.win32.exe upload/tmp/$(MAJOR).x
+	cp numpy_distutils/dist/numpy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe upload/tmp/$(MAJOR).x
+	ln -sf numpy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe numpy_distutils-latest.win32.exe
+	mv numpy_distutils-latest.win32.exe upload/tmp/$(MAJOR).x
 
-scipy_distutils_latest: upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe
+numpy_distutils_latest: upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe
 
-latest: f2py2e_latest scipy_distutils_latest
+latest: f2py2e_latest numpy_distutils_latest
 
 ##############################################################################
 # Upload files.
@@ -92,18 +92,18 @@ upload/www/$(MAJOR).x/F2PY-$(MAJOR)-latest.tar.gz: upload/tmp/$(MAJOR).x/F2PY-$(
 	-mkdir -p `dirname $@`
 	cp -P upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.tar.gz upload/www/$(MAJOR).x
 	$(UPLOADCMD) upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x/
-upload/www/$(MAJOR).x/scipy_distutils-latest.tar.gz: upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz
+upload/www/$(MAJOR).x/numpy_distutils-latest.tar.gz: upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz
 	-mkdir -p `dirname $@`
-	cp -P upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz upload/www/$(MAJOR).x/
-	$(UPLOADCMD) upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x
+	cp -P upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz upload/www/$(MAJOR).x/
+	$(UPLOADCMD) upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x
 upload/www/$(MAJOR).x/F2PY-$(MAJOR)-latest.win32.exe: upload/tmp/$(MAJOR).x/F2PY-$(MAJOR)-latest.win32.exe
 	-mkdir -p `dirname $@`
 	cp -P upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.win32.exe upload/www/$(MAJOR).x
 	$(UPLOADCMD) upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/
-upload/www/$(MAJOR).x/scipy_distutils-latest.win32.exe: upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe
+upload/www/$(MAJOR).x/numpy_distutils-latest.win32.exe: upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe
 	-mkdir -p `dirname $@`
-	cp -P upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe upload/www/$(MAJOR).x
-	$(UPLOADCMD) upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/
+	cp -P upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe upload/www/$(MAJOR).x
+	$(UPLOADCMD) upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/
 
 upload/tmp/usersguide/index.html: docs/usersguide/index.txt $(UG_FILES_DEP:%=upload/www/usersguide/%)
 	-mkdir -p upload/tmp/usersguide
@@ -167,7 +167,7 @@ clean:
 distclean: clean
 	rm -f {tests/,src/,}*~
 	rm -f tests/*.{f,f90}
-	rm -rf dist {docs/,docs/usersguide/,}build f2py2e scipy_distutils upload
+	rm -rf dist {docs/,docs/usersguide/,}build f2py2e numpy_distutils upload
 	rm -f MANIFEST f2py?.? f2py
 
 .PHONY: install test
diff --git a/numpy/f2py/TODO.txt b/numpy/f2py/TODO.txt
index fd655f2e2..093f0119e 100644
--- a/numpy/f2py/TODO.txt
+++ b/numpy/f2py/TODO.txt
@@ -1,5 +1,5 @@
 Determine fixed/free format Fortran 90 dialect from the
-contents of Fortran files. See scipy_distutils/command/build_flib.py.
+contents of Fortran files. See numpy_distutils/command/build_flib.py.
 
 [DONE]
 ========================================================================
diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
index 5c2c3e927..896156e16 100644
--- a/numpy/f2py/__init__.py
+++ b/numpy/f2py/__init__.py
@@ -21,7 +21,7 @@ def compile(source,
     ''' Build extension module from processing source with f2py.
     Read the source of this function for more information.
     '''
-    from scipy.distutils.exec_command import exec_command
+    from numpy.distutils.exec_command import exec_command
     if source_fn is None:
         fname = os.path.join(tempfile.mktemp()+'.f')
     else:
@@ -32,7 +32,7 @@ def compile(source,
     f.close()
 
     args = ' -c -m %s %s %s'%(modulename,fname,extra_args)
-    c = '%s -c "import scipy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable,args)
+    c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable,args)
     s,o = exec_command(c)
     if source_fn is None:
         try: os.remove(fname)
diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py
index 34784b39c..e4afffdd4 100644
--- a/numpy/f2py/diagnose.py
+++ b/numpy/f2py/diagnose.py
@@ -35,11 +35,11 @@ def run():
         print 'Failed to import numarray:',sys.exc_value
         has_numarray = 0
     try:
-        import scipy.base
-        has_newscipy = 1
+        import numpy.base
+        has_newnumpy = 1
     except ImportError:
-        print 'Failed to import new scipy:', sys.exc_value
-        has_newscipy = 0
+        print 'Failed to import new numpy:', sys.exc_value
+        has_newnumpy = 0
     try:
         import f2py2e
         has_f2py2e = 1
@@ -47,15 +47,15 @@ def run():
         print 'Failed to import f2py2e:',sys.exc_value
         has_f2py2e = 0
     try:
-        import scipy.distutils
-        has_scipy_distutils = 2
+        import numpy.distutils
+        has_numpy_distutils = 2
     except ImportError:
         try:
-            import scipy_distutils
-            has_scipy_distutils = 1
+            import numpy_distutils
+            has_numpy_distutils = 1
         except ImportError:
-            print 'Failed to import scipy_distutils:',sys.exc_value
-            has_scipy_distutils = 0
+            print 'Failed to import numpy_distutils:',sys.exc_value
+            has_numpy_distutils = 0
     if has_Numeric:
         try:
             print 'Found Numeric version %r in %s' % \
@@ -70,10 +70,10 @@ def run():
         except Exception,msg:
             print 'error:',msg
             print '------'
-    if has_newscipy:
+    if has_newnumpy:
         try:
-            print 'Found new scipy version %r in %s' % \
-                  (scipy.__version__, scipy.__file__)
+            print 'Found new numpy version %r in %s' % \
+                  (numpy.__version__, numpy.__file__)
         except Exception,msg:
             print 'error:', msg
             print '------'
@@ -84,24 +84,24 @@ def run():
         except Exception,msg:
             print 'error:',msg
             print '------'
-    if has_scipy_distutils:
+    if has_numpy_distutils:
         try:
-            if has_scipy_distutils==2:
-                print 'Found scipy.distutils version %r in %r' % (\
-            scipy.distutils.__version__,
-            scipy.distutils.__file__)
+            if has_numpy_distutils==2:
+                print 'Found numpy.distutils version %r in %r' % (\
+            numpy.distutils.__version__,
+            numpy.distutils.__file__)
             else:
-                print 'Found scipy_distutils version %r in %r' % (\
-            scipy_distutils.scipy_distutils_version.scipy_distutils_version,
-            scipy_distutils.__file__)
+                print 'Found numpy_distutils version %r in %r' % (\
+            numpy_distutils.numpy_distutils_version.numpy_distutils_version,
+            numpy_distutils.__file__)
             print '------'
         except Exception,msg:
             print 'error:',msg
             print '------'
         try:
-            if has_scipy_distutils==1:
-                print 'Importing scipy_distutils.command.build_flib ...',
-                import scipy_distutils.command.build_flib as build_flib
+            if has_numpy_distutils==1:
+                print 'Importing numpy_distutils.command.build_flib ...',
+                import numpy_distutils.command.build_flib as build_flib
                 print 'ok'
                 print '------'
                 try:
@@ -113,15 +113,15 @@ def run():
                     print 'error:',msg
                     print '------'
         except Exception,msg:
-            print 'error:',msg,'(ignore it, build_flib is obsolute for scipy.distutils 0.2.2 and up)'
+            print 'error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)'
             print '------'
         try:
-            if has_scipy_distutils==2:
-                print 'Importing scipy.distutils.fcompiler ...',
-                import scipy.distutils.fcompiler as fcompiler
+            if has_numpy_distutils==2:
+                print 'Importing numpy.distutils.fcompiler ...',
+                import numpy.distutils.fcompiler as fcompiler
             else:
-                print 'Importing scipy_distutils.fcompiler ...',
-                import scipy_distutils.fcompiler as fcompiler
+                print 'Importing numpy_distutils.fcompiler ...',
+                import numpy_distutils.fcompiler as fcompiler
             print 'ok'
             print '------'
             try:
@@ -135,21 +135,21 @@ def run():
             print 'error:',msg
             print '------'
         try:
-            if has_scipy_distutils==2:
-                print 'Importing scipy.distutils.cpuinfo ...',
-                from scipy.distutils.cpuinfo import cpuinfo
+            if has_numpy_distutils==2:
+                print 'Importing numpy.distutils.cpuinfo ...',
+                from numpy.distutils.cpuinfo import cpuinfo
                 print 'ok'
                 print '------'
             else:
                 try:
-                    print 'Importing scipy_distutils.command.cpuinfo ...',
-                    from scipy_distutils.command.cpuinfo import cpuinfo
+                    print 'Importing numpy_distutils.command.cpuinfo ...',
+                    from numpy_distutils.command.cpuinfo import cpuinfo
                     print 'ok'
                     print '------'
                 except Exception,msg:
                     print 'error:',msg,'(ignore it)'
-                    print 'Importing scipy_distutils.cpuinfo ...',
-                    from scipy_distutils.cpuinfo import cpuinfo
+                    print 'Importing numpy_distutils.cpuinfo ...',
+                    from numpy_distutils.cpuinfo import cpuinfo
                     print 'ok'
                     print '------'
             cpu = cpuinfo()
diff --git a/numpy/f2py/doc/index.html b/numpy/f2py/doc/index.html
index abddd7d43..6b6466b75 100644
--- a/numpy/f2py/doc/index.html
+++ b/numpy/f2py/doc/index.html
@@ -100,7 +100,7 @@ For more information, see the <a href="usersguide.html">User's
 Guide</a> of the tool. Windows users should also take a look at
 <a href="win32_notes.txt">f2py HOWTO for Win32</a> (its latest version
 can be found <a
-href="http://www.scipy.org/Members/eric/f2py_win32">here</a>).
+href="http://www.numpy.org/Members/eric/f2py_win32">here</a>).
 
 <h3>Requirements</h3>
 <ol>
@@ -210,7 +210,7 @@ You can browse <code>f2py</code> CVS repository <a href="http://cens.ioc.ee/cgi-
   <li> <a href="http://pfdubois.com/numpy/" target="_top">Numerical Python</a>.
   <li> <a href="http://pyfortran.sourceforge.net/" target="_top">Pyfort</a> -- The Python-Fortran connection tool.
   <li> <a href="http://starship.python.net/crew/hinsen/scientific.html" target="_top">Scientific Python</a>.
-  <li> <a href="http://scipy.org/" target="_top">SciPy</a> -- Scientific tools for Python (includes Multipack).
+  <li> <a href="http://numpy.org/" target="_top">SciPy</a> -- Scientific tools for Python (includes Multipack).
   <li> <a href="http://www.fortran.com/fortran/" target="_top">The Fortran Company</a>.
   <li> <a href="http://www.j3-fortran.org/" target="_top">Fortran Standards</a>.
 
diff --git a/numpy/f2py/doc/oldnews.html b/numpy/f2py/doc/oldnews.html
index 914265bbe..0e09c032f 100644
--- a/numpy/f2py/doc/oldnews.html
+++ b/numpy/f2py/doc/oldnews.html
@@ -22,7 +22,7 @@
     proper prototypes can be specified (this fixes SEGFAULTs when
     wrapping C functions with <code>f2py</code>, see <a
     href="NEWS.txt">NEWS.txt</a> for more details). Updated for the
-    latest <code>scipy_distutils</code>. Fixed few bugs.
+    latest <code>numpy_distutils</code>. Fixed few bugs.
   <dt> February 3, 2002
   <dd> Introduced <code>intent(overwrite),intent(out=name)</code>
     attributes, <code>callstatement C-expr;</code> statement, and
diff --git a/numpy/f2py/docs/FAQ.txt b/numpy/f2py/docs/FAQ.txt
index e2ed79445..416560e92 100644
--- a/numpy/f2py/docs/FAQ.txt
+++ b/numpy/f2py/docs/FAQ.txt
@@ -93,30 +93,30 @@ If upgrading from F2PY version 2.3.321 or earlier then remove all f2py
 specific files from ``/path/to/python/bin`` directory before
 running installation command.
 
-Q: How to get/upgrade scipy_distutils when using F2PY from CVS?
+Q: How to get/upgrade numpy_distutils when using F2PY from CVS?
 ---------------------------------------------------------------
 
-To get scipy_distutils from SciPy CVS repository, run
+To get numpy_distutils from SciPy CVS repository, run
 ::
 
   cd cvs/f2py2e/
-  make scipy_distutils
+  make numpy_distutils
 
-This will checkout scipy_distutils to the current directory.
+This will checkout numpy_distutils to the current directory.
 
-You can upgrade scipy_distutils by executing
+You can upgrade numpy_distutils by executing
 ::
 
-  cd cvs/f2py2e/scipy_distutils
+  cd cvs/f2py2e/numpy_distutils
   cvs update -Pd
 
 and install it by executing
 ::
 
-  cd cvs/f2py2e/scipy_distutils
-  python setup_scipy_distutils.py install
+  cd cvs/f2py2e/numpy_distutils
+  python setup_numpy_distutils.py install
 
-In most of the time, f2py2e and scipy_distutils can be upgraded
+In most of the time, f2py2e and numpy_distutils can be upgraded
 independently.
 
 Testing
@@ -210,9 +210,9 @@ See the section `Setting up environment`__ for Cygwin and MinGW.
 
 __ http://cygwin.com/
 __ http://www.mingw.org/
-__ http://cens.ioc.ee/~pearu/scipy/BUILD_WIN32.html#setting-up-environment
+__ http://cens.ioc.ee/~pearu/numpy/BUILD_WIN32.html#setting-up-environment
 
-Install scipy_distutils and F2PY. Win32 installers of these packages
+Install numpy_distutils and F2PY. Win32 installers of these packages
 are provided in `F2PY Download`__ section.
 
 __ http://cens.ioc.ee/projects/f2py2e/#download
@@ -412,14 +412,14 @@ This question may be releavant when using F2PY in Makefiles.  Here
 follows a script demonstrating how to determine which Fortran compiler
 and flags F2PY will use::
 
-  # Using post-0.2.2 scipy_distutils
-  from scipy_distutils.fcompiler import new_fcompiler
+  # Using post-0.2.2 numpy_distutils
+  from numpy_distutils.fcompiler import new_fcompiler
   compiler = new_fcompiler() # or new_fcompiler(compiler='intel')
   compiler.dump_properties()
 
-  # Using pre-0.2.2 scipy_distutils
+  # Using pre-0.2.2 numpy_distutils
   import os
-  from scipy_distutils.command.build_flib import find_fortran_compiler
+  from numpy_distutils.command.build_flib import find_fortran_compiler
   def main():
       fcompiler = os.environ.get('FC_VENDOR')
       fcompiler_exec = os.environ.get('F77')
@@ -513,7 +513,7 @@ __ https://geodoc.uchicago.edu/climatewiki/WrappingBenchmarks
 
 + `Performance Python with Weave`__ by Prabhu Ramachandran.
 
-__ http://www.scipy.org/documentation/weave/weaveperformance.html
+__ http://www.numpy.org/documentation/weave/weaveperformance.html
 
 + `How To Install py-f2py on Mac OSX`__
 
@@ -527,7 +527,7 @@ Q: What projects use F2PY?
 
 + `SciPy: Scientific tools for Python`__
 
-__ http://www.scipy.org/
+__ http://www.numpy.org/
 
 + `The Bolometer Data Analysis Project`__
 
@@ -573,7 +573,7 @@ Here are some comments people have posted to f2py mailing list and c.l.py:
 + Fernando Perez: Anyway, many many thanks for this amazing tool.
 
   I haven't used pyfort, but I can definitely vouch for the amazing quality of 
-  f2py.  And since f2py is actively used by scipy, it won't go unmaintained.  
+  f2py.  And since f2py is actively used by numpy, it won't go unmaintained.  
   It's quite impressive, and very easy to use.
 
 + Kevin Mueller: First off, thanks to those responsible for F2PY; 
diff --git a/numpy/f2py/docs/HISTORY.txt b/numpy/f2py/docs/HISTORY.txt
index 876ab2362..72b683eb0 100644
--- a/numpy/f2py/docs/HISTORY.txt
+++ b/numpy/f2py/docs/HISTORY.txt
@@ -27,7 +27,7 @@ Release 2.46.243
 
 * f2py2e.py
 
-  - Added support for scipy.distutils version 0.4.0.
+  - Added support for numpy.distutils version 0.4.0.
 
 * Documentation
 
@@ -111,8 +111,8 @@ Release 2.45.241_1926
 * setup.py
 
   - Clean up.
-  - Disabled ``need_scipy_distutils`` function. From now on it is assumed
-    that proper version of ``scipy_distutils`` is already installed.
+  - Disabled ``need_numpy_distutils`` function. From now on it is assumed
+    that proper version of ``numpy_distutils`` is already installed.
 
 * capi_maps.py
 
@@ -168,7 +168,7 @@ Release 2.43.239_1831
 
   - Intoduced ``--help-link`` and ``--link-<resource>``
     switches to link generated extension module with system
-    ``<resource>`` as defined by scipy_distutils/system_info.py.
+    ``<resource>`` as defined by numpy_distutils/system_info.py.
 
 * fortranobject.c
 
@@ -356,7 +356,7 @@ Release 2.39.235_1644
 * docs
 
   - Initial f2py manpage file f2py.1.
-  - Updated usersguide and other docs when using scipy_distutils 0.2.2
+  - Updated usersguide and other docs when using numpy_distutils 0.2.2
     and up.
 
 * capi_maps.py
@@ -383,7 +383,7 @@ Release 2.39.235_1644
 
 * diagnose.py
 
-  - Updated for scipy_distutils 0.2.2 and up.
+  - Updated for numpy_distutils 0.2.2 and up.
   - Added numarray support to diagnose.
 
 * fortranobject.c
@@ -394,7 +394,7 @@ Release 2.39.235_1644
 
 * f2py2e.py
 
-  - Applying new hooks for scipy_distutils 0.2.2 and up, keeping
+  - Applying new hooks for numpy_distutils 0.2.2 and up, keeping
     backward compatibility with depreciation messages.
   - Using always os.system on non-posix platforms in f2py2e.compile
     function.
@@ -410,8 +410,8 @@ Release 2.39.235_1644
 * setup.py
 
   - Installing f2py.py instead of f2py.bat under NT.   
-  - Introduced ``--with-scipy_distutils`` that is useful when making
-    f2py tar-ball with scipy_distutils included.
+  - Introduced ``--with-numpy_distutils`` that is useful when making
+    f2py tar-ball with numpy_distutils included.
 
 Release 2.37.233-1545
 =====================
@@ -466,7 +466,7 @@ Release 2.35.229-1505
 
 * setup.py
 
-  - Updated the CVS location of scipy_distutils.
+  - Updated the CVS location of numpy_distutils.
 
 * auxfuncs.py
 
@@ -566,7 +566,7 @@ Public Release 2.32.225-1419
 
 * setup.py
 
-  - Install scipy_distutils only if it is missing or is too old
+  - Install numpy_distutils only if it is missing or is too old
     for f2py.
 
 * f90modrules.py
@@ -667,7 +667,7 @@ Public Release 2.32.225-1419
   - Introduced dummy routine feature.
   - F77 and F90 wrapper subroutines (if any) as saved to different
     files, <modulename>-f2pywrappers.f and <modulename>-f2pywrappers2.f90,
-    respectively. Therefore, wrapping F90 requires scipy_distutils >= 
+    respectively. Therefore, wrapping F90 requires numpy_distutils >= 
     0.2.0_alpha_2.229.
   - Fixed compiler warnings about meaningless ``const void (*f2py_func)(..)``.
   - Improved error messages for ``*_from_pyobj``.
@@ -739,7 +739,7 @@ Older Releases
  *** Cleaned up the output of 'f2py -h': removed obsolete items,
     added build_flib options section. 
  *** Added --help-compiler option: it lists available Fortran compilers
-    as detected by scipy_distutils/command/build_flib.py. This option
+    as detected by numpy_distutils/command/build_flib.py. This option
     is available only with -c option.
 
 
@@ -789,7 +789,7 @@ Older Releases
 
 ::
 
- *** Updated f2py for the latest scipy_distutils.
+ *** Updated f2py for the latest numpy_distutils.
  *** A nasty bug with multi-dimensional Fortran arrays is fixed
     (intent(out) arrays had wrong shapes). (Thanks to Eric for 
     pointing out this bug).
@@ -801,7 +801,7 @@ Older Releases
 
 ::
 
- *** Updated f2py for the latest scipy_distutils.
+ *** Updated f2py for the latest numpy_distutils.
  *** Fixed raise error when f2py missed -m flag.
  *** Script name `f2py' now depends on the name of python executable.
     For example, `python2.2 setup.py install' will create a f2py
@@ -924,7 +924,7 @@ Older Releases
  *** Fixed -c process. Removed pyf_extensions function and pyf_file class.
  *** Reorganized setup.py. It generates f2py or f2py.bat scripts
     depending on the OS and the location of the python executable.
- *** Started to use update_version from scipy_distutils that makes
+ *** Started to use update_version from numpy_distutils that makes
     f2py startup faster. As a side effect, the version number system
     changed.
  *** Introduced test-site/test_f2py2e.py script that runs all
@@ -933,20 +933,20 @@ Older Releases
     when run_main is called several times.
  *** Added 'import Numeric' to C/API init<module> function.
  *** Fixed f2py.bat in setup.py.
- *** Switched over to scipy_distutils and dropped fortran_support.
+ *** Switched over to numpy_distutils and dropped fortran_support.
  *** On Windows create f2py.bat file.
  *** Introduced -c option: read fortran or pyf files, construct extension
     modules, build, and save them to current directory. 
     In one word: do-it-all-in-one-call.
  *** Introduced pyf_extensions(sources,f2py_opts) function. It simplifies
     the extension building process considerably. Only for internal use.
- *** Converted tests to use scipy_distutils in order to improve portability:
+ *** Converted tests to use numpy_distutils in order to improve portability:
     a,b,c
  *** f2py2e.run_main() returns a pyf_file class instance containing
     information about f2py generated files.
  *** Introduced `--build-dir <dirname>' command line option.
  *** Fixed setup.py for bdist_rpm command.
- *** Added --scipy-setup command line option.
+ *** Added --numpy-setup command line option.
  *** Fixed crackfortran that did not recognized capitalized type
     specification with --no-lower flag.
  *** `-h stdout' writes signature to stdout.
diff --git a/numpy/f2py/docs/OLDNEWS.txt b/numpy/f2py/docs/OLDNEWS.txt
index b21215464..401d2dcee 100644
--- a/numpy/f2py/docs/OLDNEWS.txt
+++ b/numpy/f2py/docs/OLDNEWS.txt
@@ -19,7 +19,7 @@
 
   February 24, 2004
     Latest F2PY release (version 2.39.235-1644).
-    Support for scipy_distutils 0.2.2 and up (e.g. compiler flags can be
+    Support for numpy_distutils 0.2.2 and up (e.g. compiler flags can be
     changed via f2py command line options). Implemented support for
     character arrays and arrays of strings (e.g. ``character*(*) a(m,..)``).
     *Important bug fixes regarding complex arguments, upgrading is
diff --git a/numpy/f2py/docs/README.txt b/numpy/f2py/docs/README.txt
index fc7149645..bc1aa6943 100644
--- a/numpy/f2py/docs/README.txt
+++ b/numpy/f2py/docs/README.txt
@@ -82,7 +82,7 @@ facilitate:
   multi-dimensional Fortran and Numerical Python (i.e. C) arrays.
 
 In addition, F2PY can build the generated extension modules to shared
-libraries with one command. F2PY uses the ``scipy_distutils`` module
+libraries with one command. F2PY uses the ``numpy_distutils`` module
 from SciPy_ that supports number of major Fortran compilers.
 
 ..
@@ -196,17 +196,17 @@ and/or Fortran compilers installed.
  Download
 ==========
 
-You can download the sources for the latest F2PY and scipy_distutils
+You can download the sources for the latest F2PY and numpy_distutils
 releases as:
 
 * `2.x`__/`F2PY-2-latest.tar.gz`__
-* `2.x`__/`scipy_distutils-latest.tar.gz`__
+* `2.x`__/`numpy_distutils-latest.tar.gz`__
 
 Windows users might be interested in Win32 installer for F2PY and
 Scipy_distutils (these installers are built using Python 2.3):
 
 * `2.x`__/`F2PY-2-latest.win32.exe`__
-* `2.x`__/`scipy_distutils-latest.win32.exe`__
+* `2.x`__/`numpy_distutils-latest.win32.exe`__
 
 Older releases are also available in the directories
 `rel-0.x`__, `rel-1.x`__, `rel-2.x`__, `rel-3.x`__, `rel-4.x`__, `rel-5.x`__,
@@ -215,11 +215,11 @@ if you need them.
 .. __: 2.x/
 .. __: 2.x/F2PY-2-latest.tar.gz
 .. __: 2.x/
-.. __: 2.x/scipy_distutils-latest.tar.gz
+.. __: 2.x/numpy_distutils-latest.tar.gz
 .. __: 2.x/
 .. __: 2.x/F2PY-2-latest.win32.exe
 .. __: 2.x/
-.. __: 2.x/scipy_distutils-latest.win32.exe
+.. __: 2.x/numpy_distutils-latest.win32.exe
 .. __: rel-0.x
 .. __: rel-1.x
 .. __: rel-2.x
@@ -250,7 +250,7 @@ See also Installation__ section in `F2PY FAQ`_.
 
 .. __: FAQ.html#installation
 
-Similarly, to install ``scipy_distutils``, unpack its tar-ball and run::
+Similarly, to install ``numpy_distutils``, unpack its tar-ball and run::
 
   python setup.py install
 
@@ -433,7 +433,7 @@ __ http://jrfonseca.dyndns.org/debian/
 
 .. _CVS: http://www.cvshome.org/
 .. _Python: http://www.python.org/
-.. _SciPy: http://www.scipy.org/
+.. _SciPy: http://www.numpy.org/
 .. _NumPy: http://www.numpy.org/
 .. _Numarray: http://www.stsci.edu/resources/software_hardware/numarray
 .. _docutils: http://docutils.sourceforge.net/
diff --git a/numpy/f2py/docs/TESTING.txt b/numpy/f2py/docs/TESTING.txt
index feae18dc6..d90521175 100644
--- a/numpy/f2py/docs/TESTING.txt
+++ b/numpy/f2py/docs/TESTING.txt
@@ -98,7 +98,7 @@ scripts:
     f2py -c --help-fcompiler
 
   to find out what compilers are available (or more precisely, which
-  ones are recognized by ``scipy_distutils``).
+  ones are recognized by ``numpy_distutils``).
 
 Reporting failures
 ------------------
diff --git a/numpy/f2py/docs/THANKS.txt b/numpy/f2py/docs/THANKS.txt
index cbaa083fc..737e17134 100644
--- a/numpy/f2py/docs/THANKS.txt
+++ b/numpy/f2py/docs/THANKS.txt
@@ -43,7 +43,7 @@ out and let me know, I'll add your name.)
 Special thanks are due to ...
 
 Eric Jones - he and Travis O. are responsible for starting the
-scipy_distutils project that allowed to move most of the platform and
+numpy_distutils project that allowed to move most of the platform and
 compiler specific codes out from F2PY. This simplified maintaining the
 F2PY project considerably.
 
diff --git a/numpy/f2py/docs/usersguide/index.txt b/numpy/f2py/docs/usersguide/index.txt
index 9fafb99fb..5a8d12c68 100644
--- a/numpy/f2py/docs/usersguide/index.txt
+++ b/numpy/f2py/docs/usersguide/index.txt
@@ -56,7 +56,7 @@ following steps:
 
 * F2PY compiles all sources and builds an extension module containing
   the wrappers. In building extension modules, F2PY uses
-  ``scipy_distutils`` that supports a number of Fortran 77/90/95
+  ``numpy_distutils`` that supports a number of Fortran 77/90/95
   compilers, including Gnu, Intel,
   Sun Fortre, SGI MIPSpro, Absoft, NAG, Compaq etc. compilers.
 
@@ -1458,7 +1458,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches:
     Search include files from given directories.
 
   ``--help-link [<list of resources names>]`` 
-    List system resources found by ``scipy_distutils/system_info.py``.
+    List system resources found by ``numpy_distutils/system_info.py``.
     For example, try ``f2py --help-link lapack_opt``.
 
 3. To build an extension module, use
@@ -1529,7 +1529,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches:
   ``link-<resource>``
 
     Link extension module with <resource> as defined by
-    ``scipy_distutils/system_info.py``. E.g. to link with optimized
+    ``numpy_distutils/system_info.py``. E.g. to link with optimized
     LAPACK libraries (vecLib on MacOSX, ATLAS elsewhere), use
     ``--link-lapack_opt``. See also ``--help-link`` switch.
 
@@ -1612,10 +1612,10 @@ The following functions are provided by the ``f2py2e`` module:
     :literal:
 
 ==========================
-Using ``scipy_distutils``
+Using ``numpy_distutils``
 ==========================
 
-``scipy_distutils`` is part of the SciPy_ project and aims to extend
+``numpy_distutils`` is part of the SciPy_ project and aims to extend
 standard Python ``distutils`` to deal with Fortran sources and F2PY
 signature files, e.g. compile Fortran sources, call F2PY to construct
 extension modules, etc. 
@@ -1638,7 +1638,7 @@ extension modules, etc.
 
   __ setup_example.py
 
-``scipy_distutils`` extends ``distutils`` with the following features:
+``numpy_distutils`` extends ``distutils`` with the following features:
 
 * ``Extension`` class argument ``sources`` may contain Fortran source
   files. In addition, the list ``sources`` may contain at most one
@@ -1654,7 +1654,7 @@ extension modules, etc.
   Additional options to F2PY process can be given using ``Extension``
   class argument ``f2py_options``.
 
-``scipy_distutils`` 0.2.2 and up
+``numpy_distutils`` 0.2.2 and up
 ================================
 
 * The following new ``distutils`` commands are defined:
@@ -1682,14 +1682,14 @@ extension modules, etc.
  
     absoft sun mips intel intelv intele intelev nag compaq compaqv gnu vast pg hpux
 
-  See ``scipy_distutils/fcompiler.py`` for up-to-date list of
+  See ``numpy_distutils/fcompiler.py`` for up-to-date list of
   supported compilers or run
 
   ::
 
      f2py -c --help-fcompiler
 
-``scipy_distutils`` pre 0.2.2
+``numpy_distutils`` pre 0.2.2
 =============================
 
 * The following new ``distutils`` commands are defined:
@@ -1715,7 +1715,7 @@ extension modules, etc.
  
     Absoft Sun SGI Intel Itanium NAG Compaq Digital Gnu VAST PG
 
-  See ``scipy_distutils/command/build_flib.py`` for up-to-date list of
+  See ``numpy_distutils/command/build_flib.py`` for up-to-date list of
   supported compilers.
 
 ======================
@@ -1769,4 +1769,4 @@ In Python:
 .. _F2PY: http://cens.ioc.ee/projects/f2py2e/
 .. _Python: http://www.python.org/
 .. _NumPy: http://www.numpy.org/
-.. _SciPy: http://www.scipy.org/
+.. _SciPy: http://www.numpy.org/
diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py
index a7d27403a..e5f5e8441 100644
--- a/numpy/f2py/docs/usersguide/setup_example.py
+++ b/numpy/f2py/docs/usersguide/setup_example.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # File: setup_example.py
 
-from scipy_distutils.core import Extension
+from numpy_distutils.core import Extension
 
 ext1 = Extension(name = 'scalar',
                  sources = ['scalar.f'])
@@ -9,7 +9,7 @@ ext2 = Extension(name = 'fib2',
                  sources = ['fib2.pyf','fib1.f'])
 
 if __name__ == "__main__":
-    from scipy_distutils.core import setup
+    from numpy_distutils.core import setup
     setup(name = 'f2py_example',
           description       = "F2PY Users Guide examples",
           author            = "Pearu Peterson",
diff --git a/numpy/f2py/f2py.1 b/numpy/f2py/f2py.1
index 3b9f054af..5ca9a3ab5 100644
--- a/numpy/f2py/f2py.1
+++ b/numpy/f2py/f2py.1
@@ -151,7 +151,7 @@ The following options are effective only when -c switch is used.
 .TP
 .B \-\-link-<resource> 
 Link extension module with <resource> as defined by
-scipy_distutils/system_info.py. E.g. to link with optimized LAPACK
+numpy_distutils/system_info.py. E.g. to link with optimized LAPACK
 libraries (vecLib on MacOSX, ATLAS elsewhere), use
 --link-lapack_opt. See also --help-link switch.
 
@@ -184,7 +184,7 @@ Numerical Python 13 or higher (20.x,21.x,22.x,23.x are supported).
 
 Optional Numarray 0.9 or higher partially supported.
 
-scipy_distutils from Scipy (can be downloaded from F2PY homepage)
+numpy_distutils from Scipy (can be downloaded from F2PY homepage)
 .SH "SEE ALSO"
 python(1)
 .SH BUGS
@@ -200,7 +200,7 @@ User's Guide: http://cens.ioc.ee/projects/f2py2e/usersguide/
 
 Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
 
-Scipy website: http://www.scipy.org
+Scipy website: http://www.numpy.org
 .SH COPYRIGHT
 Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
 .SH LICENSE
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
index 6230590d1..384359347 100755
--- a/numpy/f2py/f2py2e.py
+++ b/numpy/f2py/f2py2e.py
@@ -36,9 +36,9 @@ import f90mod_rules
 outmess = auxfuncs.outmess
 
 try:
-    from scipy import __core_version__ as scipy_core_version
+    from numpy import __core_version__ as numpy_core_version
 except ImportError:
-    scipy_distutils_version = 'N/A'
+    numpy_distutils_version = 'N/A'
 
 __usage__ = """\
 Usage:
@@ -117,7 +117,7 @@ Options:
   -v               Print f2py version ID and exit.
 
 
-scipy.distutils options (only effective with -c):
+numpy.distutils options (only effective with -c):
 
   --fcompiler=         Specify Fortran compiler type by vendor
   --compiler=          Specify C compiler type (as defined by distutils)
@@ -136,7 +136,7 @@ scipy.distutils options (only effective with -c):
 Extra options (only effective with -c):
 
   --link-<resource>    Link extension module with <resource> as defined
-                       by scipy.distutils/system_info.py. E.g. to link
+                       by numpy.distutils/system_info.py. E.g. to link
                        with optimized LAPACK libraries (vecLib on MacOSX,
                        ATLAS elsewhere), use --link-lapack_opt.
                        See also --help-link switch.
@@ -160,11 +160,11 @@ Extra options (only effective with -c):
   a message should be shown.
 
 Version:     %s
-scipy_core Version: %s
+numpy_core Version: %s
 Requires:    Python 2.3 or higher.
 License:     LGPL (see http://www.fsf.org)
 Copyright 1999 - 2005 Pearu Peterson all rights reserved.
-http://cens.ioc.ee/projects/f2py2e/"""%(f2py_version, scipy_core_version)
+http://cens.ioc.ee/projects/f2py2e/"""%(f2py_version, numpy_core_version)
 
 
 def scaninputline(inputline):
@@ -430,7 +430,7 @@ def run_compile():
         for s in flib_flags:
             v = '--fcompiler='
             if s[:len(v)]==v:
-                from scipy.distutils import fcompiler
+                from numpy.distutils import fcompiler
                 allowed_keys = fcompiler.fcompiler_class.keys()
                 nv = ov = s[len(v):].lower()
                 if ov not in allowed_keys:
@@ -461,7 +461,7 @@ def run_compile():
         del sys.argv[i+1],sys.argv[i]
         sources = sys.argv[1:]
     else:
-        from scipy.distutils.command.build_src import get_f2py_modulename
+        from numpy.distutils.command.build_src import get_f2py_modulename
         pyf_files,sources = filter_files('','[.]pyf([.]src|)',sources)
         sources = pyf_files + sources
         for f in pyf_files:
@@ -486,20 +486,20 @@ def run_compile():
         else:
             print 'Invalid use of -D:',name_value
 
-    from scipy.distutils.system_info import get_info
+    from numpy.distutils.system_info import get_info
 
     num_include_dir = None
     num_info = {}
-    #import scipy
-    #n = 'scipy'
-    #p = get_prefix(scipy)
-    #from scipy.distutils.misc_util import get_scipy_include_dirs
-    #num_info = {'include_dirs': get_scipy_include_dirs()}
+    #import numpy
+    #n = 'numpy'
+    #p = get_prefix(numpy)
+    #from numpy.distutils.misc_util import get_numpy_include_dirs
+    #num_info = {'include_dirs': get_numpy_include_dirs()}
 
     if num_info:
         include_dirs.extend(num_info.get('include_dirs',[]))
 
-    from scipy.distutils.core import setup,Extension
+    from numpy.distutils.core import setup,Extension
     ext_args = {'name':modulename,'sources':sources,
                 'include_dirs': include_dirs,
                 'library_dirs': library_dirs,
@@ -511,7 +511,7 @@ def run_compile():
                 }
 
     if sysinfo_flags:
-        from scipy.distutils.misc_util import dict_append
+        from numpy.distutils.misc_util import dict_append
         for n in sysinfo_flags:
             i = get_info(n)
             if not i:
@@ -539,7 +539,7 @@ def run_compile():
 def main():
     if '--help-link' in sys.argv[1:]:
         sys.argv.remove('--help-link')
-        from scipy.distutils.system_info import show_all
+        from numpy.distutils.system_info import show_all
         show_all()
         return
     if '-c' in sys.argv[1:]:
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index cb2d78e65..d61489951 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -174,7 +174,7 @@ DL_EXPORT(void) init#modulename#(void) {
 \tPyFortran_Type.ob_type = &PyType_Type;
 \timport_array();
 \tif (PyErr_Occurred())
-\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import scipy.base)\");
+\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import numpy.base)\");
 \td = PyModule_GetDict(m);
 \ts = PyString_FromString(\"$R"""+"""evision: $\");
 \tPyDict_SetItemString(d, \"__version__\", s);
diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
index 2616ccbd5..8c6a4a698 100755
--- a/numpy/f2py/setup.py
+++ b/numpy/f2py/setup.py
@@ -21,8 +21,8 @@ __version__ = "$Id: setup.py,v 1.32 2005/01/30 17:22:14 pearu Exp $"
 import os
 import sys
 from distutils.dep_util import newer
-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
 
 from __version__ import version
 
@@ -53,7 +53,7 @@ def configuration(parent_package='',top_path=None):
 # See http://cens.ioc.ee/projects/f2py2e/
 import os
 os.environ["NO_SCIPY_IMPORT"]="f2py"
-import scipy.f2py as f2py
+import numpy.f2py as f2py
 f2py.main()
 '''%(os.path.basename(sys.executable)))
             f.close()
diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h
index 680e6690e..44778822a 100644
--- a/numpy/f2py/src/fortranobject.h
+++ b/numpy/f2py/src/fortranobject.h
@@ -10,7 +10,7 @@ extern "C" {
 #define NO_IMPORT_ARRAY
 #endif
 #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
-#include "scipy/arrayobject.h"
+#include "numpy/arrayobject.h"
 
   /*
 #ifdef F2PY_REPORT_ATEXIT_DISABLE
diff --git a/numpy/f2py/tests/array_from_pyobj/setup.py b/numpy/f2py/tests/array_from_pyobj/setup.py
index ff7ff8cfc..f449117a7 100644
--- a/numpy/f2py/tests/array_from_pyobj/setup.py
+++ b/numpy/f2py/tests/array_from_pyobj/setup.py
@@ -1,10 +1,10 @@
 
 import os
 def configuration(parent_name='',top_path=None):
-    from scipy.distutils.misc_util import Configuration
+    from numpy.distutils.misc_util import Configuration
 
     config = Configuration('array_from_pyobj',parent_name,top_path)
-    #import scipy.f2py as f2py
+    #import numpy.f2py as f2py
     #f2pydir=os.path.dirname(os.path.abspath(f2py.__file__))
     f2pydir=os.path.join(config.local_path,'..','..')
     fobjhsrc = os.path.join(f2pydir,'src','fortranobject.h')
@@ -22,5 +22,5 @@ def configuration(parent_name='',top_path=None):
     return config
 
 if __name__ == "__main__":
-    from scipy.distutils.core import setup
+    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
diff --git a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
index 309ad03f6..8df22d2a5 100644
--- a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py
@@ -2,8 +2,8 @@ import unittest
 import sys
 import copy
 
-from scipy.test.testing import *
-from scipy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros
+from numpy.test.testing import *
+from numpy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros
 set_package_path()
 from array_from_pyobj import wrap
 del sys.path[0]
diff --git a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
index 0d9e41f1c..972cdb403 100644
--- a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
+++ b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
@@ -120,7 +120,7 @@ DL_EXPORT(void) initwrap(void) {
   PyFortran_Type.ob_type = &PyType_Type;
   import_array();
   if (PyErr_Occurred())
-    Py_FatalError("can't initialize module wrap (failed to import scipy.base)");
+    Py_FatalError("can't initialize module wrap (failed to import numpy.base)");
   d = PyModule_GetDict(m);
   s = PyString_FromString("This module 'wrap' is auto-generated with f2py (version:2_1330).\nFunctions:\n"
 "  arr = call(type_num,dims,intent,obj)\n"
diff --git a/numpy/f2py/tests/f77/return_integer.py b/numpy/f2py/tests/f77/return_integer.py
index f50ab52da..0f5d270c4 100644
--- a/numpy/f2py/tests/f77/return_integer.py
+++ b/numpy/f2py/tests/f77/return_integer.py
@@ -7,8 +7,8 @@ Examples:
   python return_integer.py --quiet
 """
 
-import scipy.f2py as f2py2e
-from scipy.base import array
+import numpy.f2py as f2py2e
+from numpy.base import array
 
 def build(f2py_opts):
     try:
@@ -144,5 +144,5 @@ if __name__=='__main__':
         if status:
             print '*'*20
             print 'Running f2py2e.diagnose'
-            import scipy.f2py.diagnose as diagnose
+            import numpy.f2py.diagnose as diagnose
             #diagnose.run()
diff --git a/numpy/f2py/tests/f77/return_real.py b/numpy/f2py/tests/f77/return_real.py
index 37f97a06d..4df26a587 100644
--- a/numpy/f2py/tests/f77/return_real.py
+++ b/numpy/f2py/tests/f77/return_real.py
@@ -7,8 +7,8 @@ Examples:
 """
 
 
-import scipy.f2py as f2py2e
-from scipy.base import array
+import numpy.f2py as f2py2e
+from numpy.base import array
 
 def build(f2py_opts):
     try: