summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Leslie <tim.leslie@gmail.com>2006-03-13 07:35:40 +0000
committerTim Leslie <tim.leslie@gmail.com>2006-03-13 07:35:40 +0000
commit8a65c256de43db750357e7ac468352b06c960a25 (patch)
tree8d93563ea5c9102398575e0aa94f916c95f23303
parent7ed95441ce78c441079120c49de159e8beb337fa (diff)
downloadnumpy-8a65c256de43db750357e7ac468352b06c960a25.tar.gz
update tests to all run correctly
-rw-r--r--numpy/lib/tests/test_function_base.py2
-rw-r--r--numpy/lib/tests/test_index_tricks.py4
-rw-r--r--numpy/lib/tests/test_polynomial.py2
-rw-r--r--numpy/lib/tests/test_twodim_base.py5
4 files changed, 6 insertions, 7 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index 592bd99e7..fb8ae9763 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -336,4 +336,4 @@ def compare_results(res,desired):
assert_array_equal(res[i],desired[i])
if __name__ == "__main__":
- ScipyTest('numpy.base.function_base').run()
+ ScipyTest('numpy.lib.function_base').run()
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 315bb3533..cdf20fcf9 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -1,9 +1,7 @@
from numpy.testing import *
set_package_path()
-import numpy.lib;reload(numpy.lib)
-from numpy import *
-from numpy.lib import *
+from numpy import array, ones, r_, mgrid
restore_path()
class test_grid(ScipyTestCase):
diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py
index 6813192c1..dac4d866f 100644
--- a/numpy/lib/tests/test_polynomial.py
+++ b/numpy/lib/tests/test_polynomial.py
@@ -73,6 +73,8 @@ poly1d([ 2.])
(poly1d([ 1., -1.]), poly1d([ 0.]))
"""
+from numpy.testing import *
+
import doctest
def test_suite(level=1):
return doctest.DocTestSuite()
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 4e5cdb54a..40ebac68e 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -4,9 +4,8 @@
from numpy.testing import *
set_package_path()
-import numpy.lib;reload(numpy.lib)
-from numpy import *
-from numpy.lib import *
+from numpy import arange, rot90, add, fliplr, flipud, zeros, ones, eye, \
+ array, diag
restore_path()
##################################################