From c14df60da837adeef333795d310e3c6e61e897cb Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Sun, 16 Dec 2012 17:33:04 +0100
Subject: [PATCH] Py3 test fixes

---
 tests/run/builtin_subtype_methods_T653.pyx | 48 +++++++++++++++---------------
 tests/run/function_as_method_T494.pyx      |  2 +-
 tests/run/function_as_method_py_T494.py    |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/run/builtin_subtype_methods_T653.pyx b/tests/run/builtin_subtype_methods_T653.pyx
index 484c8e3..bcfda81 100644
--- a/tests/run/builtin_subtype_methods_T653.pyx
+++ b/tests/run/builtin_subtype_methods_T653.pyx
@@ -31,12 +31,12 @@ cdef class MyDict(dict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDict(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDict(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
 
@@ -52,12 +52,12 @@ cdef class MyDictFinal(dict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDictFinal(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDictFinal(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
 
@@ -74,12 +74,12 @@ cdef class MyDict2(MyDict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDict2(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDict2(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
 
@@ -95,12 +95,12 @@ cdef class MyDict2Final(MyDict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDict2Final(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDict2Final(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
 
@@ -121,12 +121,12 @@ cdef class MyDictOverride(dict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDictOverride(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDictOverride(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
 
@@ -147,11 +147,11 @@ cdef class MyDictOverride2(MyDict):
         l.sort()
         return l
 
-    def test_iteritems(self):
+    def test_values(self):
         """
-        >>> MyDictOverride2(a=1, b=2).test_iteritems()
-        [('a', 1), ('b', 2)]
+        >>> MyDictOverride2(a=1, b=2).test_values()
+        [1, 2]
         """
-        l = [ (key, value) for key, value in self.iteritems() ]
+        l = [ v for v in self.values() ]
         l.sort()
         return l
diff --git a/tests/run/function_as_method_T494.pyx b/tests/run/function_as_method_T494.pyx
index 8269fb8..34728bc 100644
--- a/tests/run/function_as_method_T494.pyx
+++ b/tests/run/function_as_method_T494.pyx
@@ -3,7 +3,7 @@
 
 __doc__ = """
     >>> A.foo = foo
-    >>> print A().foo()
+    >>> A().foo()
     True
 """
 
diff --git a/tests/run/function_as_method_py_T494.py b/tests/run/function_as_method_py_T494.py
index 06e2e3c..49d5f27 100644
--- a/tests/run/function_as_method_py_T494.py
+++ b/tests/run/function_as_method_py_T494.py
@@ -2,7 +2,7 @@
 
 __doc__ = """
     >>> A.foo = foo
-    >>> print A().foo()
+    >>> A().foo()
     True
 """
 
-- 
2.7.4