From f115fdf57332da17fd43202a1512b02902a77048 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Thu, 5 Jan 2006 01:06:10 +0000 Subject: numpy.base -> numpy --- numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py | 4 ++-- numpy/f2py/tests/array_from_pyobj/wrapmodule.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'numpy/f2py/tests/array_from_pyobj') 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" -- cgit v1.2.1