diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 19:00:27 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 19:00:27 +0000 |
commit | e706c7d92c4ee41e8e995fb3838bd0931b57efb5 (patch) | |
tree | 015a057d49422774e49ed211a37c14105d03a713 /numpy/f2py/tests/array_from_pyobj | |
parent | c14d4fe25cb5cd482369734dd487ac8f376851c9 (diff) | |
download | numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.gz |
Changed all references to scipy to numpy
Diffstat (limited to 'numpy/f2py/tests/array_from_pyobj')
-rw-r--r-- | numpy/f2py/tests/array_from_pyobj/setup.py | 6 | ||||
-rw-r--r-- | numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py | 4 | ||||
-rw-r--r-- | numpy/f2py/tests/array_from_pyobj/wrapmodule.c | 2 |
3 files changed, 6 insertions, 6 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" |