[Numpy-svn] r8645 - trunk/numpy/polynomial/tests

numpy-svn@scip... numpy-svn@scip...
Sun Aug 15 19:10:29 CDT 2010


Author: charris
Date: 2010-08-15 19:10:29 -0500 (Sun, 15 Aug 2010)
New Revision: 8645

Modified:
   trunk/numpy/polynomial/tests/test_chebyshev.py
Log:
Merge branch 'poly'

Modified: trunk/numpy/polynomial/tests/test_chebyshev.py
===================================================================
--- trunk/numpy/polynomial/tests/test_chebyshev.py	2010-08-15 23:51:54 UTC (rev 8644)
+++ trunk/numpy/polynomial/tests/test_chebyshev.py	2010-08-16 00:10:29 UTC (rev 8645)
@@ -347,34 +347,34 @@
 
     def test_chebpts1(self):
         #test exceptions
-        yield assert_raises(ValueError, ch.chebpts1, 1.5)
-        yield assert_raises(ValueError, ch.chebpts1, 0)
+        assert_raises(ValueError, ch.chebpts1, 1.5)
+        assert_raises(ValueError, ch.chebpts1, 0)
 
         #test points
         tgt = [0]
-        yield assert_almost_equal(ch.chebpts1(1), tgt)
+        assert_almost_equal(ch.chebpts1(1), tgt)
         tgt = [-0.70710678118654746, 0.70710678118654746]
-        yield assert_almost_equal(ch.chebpts1(2), tgt)
+        assert_almost_equal(ch.chebpts1(2), tgt)
         tgt = [-0.86602540378443871, 0, 0.86602540378443871]
-        yield assert_almost_equal(ch.chebpts1(3), tgt)
+        assert_almost_equal(ch.chebpts1(3), tgt)
         tgt = [-0.9238795325, -0.3826834323,  0.3826834323,  0.9238795325]
-        yield assert_almost_equal(ch.chebpts1(4), tgt)
+        assert_almost_equal(ch.chebpts1(4), tgt)
 
 
     def test_chebpts2(self):
         #test exceptions
-        yield assert_raises(ValueError, ch.chebpts2, 1.5)
-        yield assert_raises(ValueError, ch.chebpts2, 1)
+        assert_raises(ValueError, ch.chebpts2, 1.5)
+        assert_raises(ValueError, ch.chebpts2, 1)
 
         #test points
         tgt = [-1, 1]
-        yield assert_almost_equal(ch.chebpts2(2), tgt)
+        assert_almost_equal(ch.chebpts2(2), tgt)
         tgt = [-1, 0, 1]
-        yield assert_almost_equal(ch.chebpts2(3), tgt)
-        tgt = [-1 -0.5, .5, 1]
-        yield assert_almost_equal(ch.chebpts2(4), tgt)
+        assert_almost_equal(ch.chebpts2(3), tgt)
+        tgt = [-1, -0.5, .5, 1]
+        assert_almost_equal(ch.chebpts2(4), tgt)
         tgt = [-1.0, -0.707106781187, 0, 0.707106781187, 1.0]
-        yield assert_almost_equal(ch.chebpts2(5), tgt)
+        assert_almost_equal(ch.chebpts2(5), tgt)
 
 
 



More information about the Numpy-svn mailing list