More fixes...

8 files changed, 22 insertions, 19 deletions

diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index 37d3db1bf..41cdf45b4 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -3,8 +3,9 @@ import sys
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base)
-from numpy.base import *
+import numpy.lib;reload(numpy.lib)
+from numpy.lib import *
+from numpy.core import *
 del sys.path[0]
 
 class test_any(ScipyTestCase):
diff --git a/numpy/lib/tests/test_getlimits.py b/numpy/lib/tests/test_getlimits.py
index 5e8706895..f70081518 100644
--- a/numpy/lib/tests/test_getlimits.py
+++ b/numpy/lib/tests/test_getlimits.py
@@ -3,8 +3,8 @@
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base)
-from numpy.base.getlimits import finfo
+import numpy.lib;reload(numpy.lib)
+from numpy.lib.getlimits import finfo
 from numpy import single,double,longdouble
 restore_path()
 
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index c5091909e..13d565b4c 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -1,8 +1,8 @@
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base)
-from numpy.base import *
+import numpy.lib;reload(numpy.lib)
+from numpy.lib import *
 restore_path()
 
 class test_grid(ScipyTestCase):
diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py
index d37e8b6b9..dac4d866f 100644
--- a/numpy/lib/tests/test_polynomial.py
+++ b/numpy/lib/tests/test_polynomial.py
@@ -1,6 +1,6 @@
 """
->>> import numpy.base as nx
->>> from numpy.base.polynomial import poly1d, polydiv
+>>> import numpy.core as nx
+>>> from numpy.lib.polynomial import poly1d, polydiv
 
 >>> p = poly1d([1.,2,3])
 >>> p
diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py
index 175bc8584..11cf8fc91 100644
--- a/numpy/lib/tests/test_shape_base.py
+++ b/numpy/lib/tests/test_shape_base.py
@@ -1,8 +1,9 @@
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;
-from numpy.base import *
+import numpy.lib;
+from numpy.lib import *
+from numpy.core import *
 restore_path()
 
 class test_apply_along_axis(ScipyTestCase):
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 329a23f5b..1ed309f7c 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -4,8 +4,8 @@
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base)
-from numpy.base import *
+import numpy.lib;reload(numpy.lib)
+from numpy.lib import *
 restore_path()
 
 ##################################################
diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py
index e84d86e0c..5d026a9f9 100644
--- a/numpy/lib/tests/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
@@ -3,8 +3,9 @@ import sys
 
 from numpy.testing import *
 set_package_path()
-import numpy.base;reload(numpy.base);reload(numpy.base.type_check)
-from numpy.base import *
+import numpy.lib;reload(numpy.lib);reload(numpy.lib.type_check)
+from numpy.lib import *
+from numpy.core import *
 restore_path()
 
 def assert_all(x):
diff --git a/numpy/lib/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py
index f7313526d..5934aa23d 100644
--- a/numpy/lib/tests/test_ufunclike.py
+++ b/numpy/lib/tests/test_ufunclike.py
@@ -1,6 +1,6 @@
 """
->>> import numpy.base as nx
->>> import numpy.base.ufunclike as U
+>>> import numpy.core as nx
+>>> import numpy.lib.ufunclike as U
 
 Test fix:
 >>> a = nx.array([[1.0, 1.1, 1.5, 1.8], [-1.0, -1.1, -1.5, -1.8]])
@@ -21,8 +21,8 @@ Test isposinf, isneginf, sign
 array([True, False, False, False, False, False], dtype=bool)
 >>> U.isneginf(a)
 array([False, True, False, False, False, False], dtype=bool)
->>> U.sign(a)
-array([ 1, -1,  0,  0,  1, -1])
+>>> nx.sign(a)
+array([ 1., -1.,  0.,  0.,  1., -1.])
 
 Same thing with an output array:
 >>> y = nx.zeros(a.shape, bool)
@@ -34,7 +34,7 @@ array([True, False, False, False, False, False], dtype=bool)
 array([False, True, False, False, False, False], dtype=bool)
 >>> y
 array([False, True, False, False, False, False], dtype=bool)
->>> U.sign(a, y)
+>>> nx.sign(a, y)
 array([True, True, False, False, True, True], dtype=bool)
 >>> y
 array([True, True, False, False, True, True], dtype=bool)