diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-05 01:06:10 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-05 01:06:10 +0000 |
| commit | f115fdf57332da17fd43202a1512b02902a77048 (patch) | |
| tree | 0fa00da1f6964ceda06bc11daa4bae9d44fd9246 /numpy/f2py/tests | |
| parent | fc95346cc7568d2464cb4daa955b947d5b42a457 (diff) | |
| download | numpy-f115fdf57332da17fd43202a1512b02902a77048.tar.gz | |
numpy.base -> numpy
Diffstat (limited to 'numpy/f2py/tests')
| -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 | ||||
| -rw-r--r-- | numpy/f2py/tests/f77/return_integer.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/f77/return_real.py | 2 |
4 files changed, 5 insertions, 5 deletions
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 8df22d2a5..9cd01fa7c 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 numpy.test.testing import * -from numpy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros +from numpy.testing import * +from numpy 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 972cdb403..ea106d9ac 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 numpy.base)"); + Py_FatalError("can't initialize module wrap (failed to import numpy)"); 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 0f5d270c4..5bd7ae1ab 100644 --- a/numpy/f2py/tests/f77/return_integer.py +++ b/numpy/f2py/tests/f77/return_integer.py @@ -8,7 +8,7 @@ Examples: """ import numpy.f2py as f2py2e -from numpy.base import array +from numpy import array def build(f2py_opts): try: diff --git a/numpy/f2py/tests/f77/return_real.py b/numpy/f2py/tests/f77/return_real.py index 4df26a587..7bd34b51d 100644 --- a/numpy/f2py/tests/f77/return_real.py +++ b/numpy/f2py/tests/f77/return_real.py @@ -8,7 +8,7 @@ Examples: import numpy.f2py as f2py2e -from numpy.base import array +from numpy import array def build(f2py_opts): try: |