5 files changed, 11 insertions, 11 deletions
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: