3K: f2py: don't use test generators in the tests -- they don't really work on Nose on Py3

5 files changed, 26 insertions, 67 deletions

diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py
index 166ed1f54..d0dfebe87 100644
--- a/numpy/f2py/tests/test_return_character.py
+++ b/numpy/f2py/tests/test_return_character.py
@@ -1,24 +1,25 @@
 from numpy.testing import *
 from numpy import array
+from numpy.compat import asbytes
 import util
 
 class TestReturnCharacter(util.F2PyTest):
-    def _check_function(self, t):
+    def check_function(self, t):
         tname = t.__doc__.split()[0]
         if tname in ['t0','t1','s0','s1']:
-            assert t(23)=='2'
-            r = t('ab');assert r=='a',`r`
-            r = t(array('ab'));assert r=='a',`r`
-            r = t(array(77,'u1'));assert r=='M',`r`
+            assert t(23)==asbytes('2')
+            r = t('ab');assert r==asbytes('a'),`r`
+            r = t(array('ab'));assert r==asbytes('a'),`r`
+            r = t(array(77,'u1'));assert r==asbytes('M'),`r`
             #assert_raises(ValueError, t, array([77,87]))
             #assert_raises(ValueError, t, array(77))
         elif tname in ['ts','ss']:
-            assert t(23)=='23        ',`t(23)`
-            assert t('123456789abcdef')=='123456789a'
+            assert t(23)==asbytes('23        '),`t(23)`
+            assert t('123456789abcdef')==asbytes('123456789a')
         elif tname in ['t5','s5']:
-            assert t(23)=='23   ',`t(23)`
-            assert t('ab')=='ab   ',`t('ab')`
-            assert t('123456789abcdef')=='12345'
+            assert t(23)==asbytes('23   '),`t(23)`
+            assert t('ab')==asbytes('ab   '),`t('ab')`
+            assert t('123456789abcdef')==asbytes('12345')
         else:
             raise NotImplementedError
 
@@ -73,12 +74,7 @@ cf2py    intent(out) ts
 
     def test_all(self):
         for name in "t0,t1,t5,s0,s1,s5,ss".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module, name)
-        self._check_function(t)
-
+            self.check_function(getattr(self.module, name))
 
 class TestF90ReturnCharacter(TestReturnCharacter):
     suffix = ".f90"
@@ -135,11 +131,7 @@ end module f90_return_char
 
     def test_all(self):
         for name in "t0,t1,t5,ts,s0,s1,s5,ss".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module.f90_return_char, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module.f90_return_char, name))
 
 if __name__ == "__main__":
     import nose
diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py
index ce5355a62..7a361bae0 100644
--- a/numpy/f2py/tests/test_return_complex.py
+++ b/numpy/f2py/tests/test_return_complex.py
@@ -3,7 +3,7 @@ from numpy import array
 import util
 
 class TestReturnComplex(util.F2PyTest):
-    def _check_function(self, t):
+    def check_function(self, t):
         tname = t.__doc__.split()[0]
         if tname in ['t0','t8','s0','s8']:
             err = 1e-5
@@ -99,11 +99,7 @@ cf2py    intent(out) td
 
     def test_all(self):
         for name in "t0,t8,t16,td,s0,s8,s16,sd".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module, name))
 
 
 class TestF90ReturnComplex(TestReturnComplex):
@@ -161,11 +157,7 @@ end module f90_return_complex
 
     def test_all(self):
         for name in "t0,t8,t16,td,s0,s8,s16,sd".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module.f90_return_complex, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module.f90_return_complex, name))
 
 if __name__ == "__main__":
     import nose
diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py
index fbda46e08..bc92af5b7 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -3,7 +3,7 @@ from numpy import array
 import util
 
 class TestReturnInteger(util.F2PyTest):
-    def _check_function(self, t):
+    def check_function(self, t):
         assert t(123)==123,`t(123)`
         assert t(123.6)==123
         assert t(123l)==123
@@ -97,11 +97,7 @@ cf2py    intent(out) t8
 
     def test_all(self):
         for name in "t0,t1,t2,t4,t8,s0,s1,s2,s4,s8".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module, name))
 
 
 class TestF90ReturnInteger(TestReturnInteger):
@@ -170,11 +166,7 @@ end module f90_return_integer
 
     def test_all(self):
         for name in "t0,t1,t2,t4,t8,s0,s1,s2,s4,s8".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module.f90_return_integer, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module.f90_return_integer, name))
 
 if __name__ == "__main__":
     import nose
diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py
index f75a5a0ac..a1bd028c3 100644
--- a/numpy/f2py/tests/test_return_logical.py
+++ b/numpy/f2py/tests/test_return_logical.py
@@ -3,7 +3,7 @@ from numpy import array
 import util
 
 class TestReturnLogical(util.F2PyTest):
-    def _check_function(self, t):
+    def check_function(self, t):
         assert t(True)==1,`t(True)`
         assert t(False)==0,`t(False)`
         assert t(0)==0
@@ -107,11 +107,7 @@ c       end
 
     def test_all(self):
         for name in "t0,t1,t2,t4,s0,s1,s2,s4".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module, name))
 
 class TestF90ReturnLogical(TestReturnLogical):
     suffix = ".f90"
@@ -179,11 +175,7 @@ end module f90_return_logical
 
     def test_all(self):
         for name in "t0,t1,t2,t4,t8,s0,s1,s2,s4,s8".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        t = getattr(self.module.f90_return_logical, name)
-        self._check_function(t)
+            self.check_function(getattr(self.module.f90_return_logical, name))
 
 if __name__ == "__main__":
     import nose
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index dd4c93fb9..84f5da0ff 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -4,7 +4,7 @@ import math
 import util
 
 class TestReturnReal(util.F2PyTest):
-    def _check_function(self, t):
+    def check_function(self, t):
         if t.__doc__.split()[0] in ['t0','t4','s0','s4']:
             err = 1e-5
         else:
@@ -79,10 +79,7 @@ end python module c_ext_return_real
 
     def test_all(self):
         for name in "t4,t8,s4,s8".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        self._check_function(getattr(self.module, name))
+            self.check_function(getattr(self.module, name))
 
 class TestF77ReturnReal(TestReturnReal):
     code = """
@@ -135,10 +132,7 @@ cf2py    intent(out) td
 
     def test_all(self):
         for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        self._check_function(getattr(self.module, name))
+            self.check_function(getattr(self.module, name))
 
 class TestF90ReturnReal(TestReturnReal):
     suffix = ".f90"
@@ -195,10 +189,7 @@ end module f90_return_real
 
     def test_all(self):
         for name in "t0,t4,t8,td,s0,s4,s8,sd".split(","):
-            yield self.check_function, name
-
-    def check_function(self, name):
-        self._check_function(getattr(self.module.f90_return_real, name))
+            self.check_function(getattr(self.module.f90_return_real, name))
 
 
 if __name__ == "__main__":