lots of test fixes for Py3

diff --git a/tests/run/kostyrka2.pyx b/tests/run/kostyrka2.pyx
index b89758e302e75a265c40d62c6f46b8fbe9017988..e3c67e9354e87d30ef4ae0f47b1c0a09d4ea242b 100644 (file)
--- a/tests/run/kostyrka2.pyx
+++ b/tests/run/kostyrka2.pyx
@@ -1,8 +1,12 @@
 __doc__ = u"""
     >>> x = X()
     >>> x.slots
-    ['']
+    [b'']
 """
 
+import sys
+if sys.version_info[0] < 3:
+    __doc__ = __doc__.replace(u" b'", u" '")
+
 class X:
         slots = ["", ]

diff --git a/tests/run/multass.pyx b/tests/run/multass.pyx
index cbc50a01faa0190c4ec7ddd5c75101df317a9c0d..fb23494d6cad96ad1e796f4aa6a12ab8ae974baf 100644 (file)
--- a/tests/run/multass.pyx
+++ b/tests/run/multass.pyx
@@ -4,11 +4,15 @@ __doc__ = u"""
     >>> g()
     (1, 1, 2, 2, 3, 3)
     >>> h()
-    (1, 'test', 3, 1, 'test', 3)
+    (1, b'test', 3, 1, b'test', 3)
     >>> j()
     (2, 1, 4, 2, 6, 3)
 """
 
+import sys
+if sys.version_info[0] < 3:
+    __doc__ = __doc__.replace(u" b'", u" '")
+
 def f():
     cdef object obj1a, obj2a, obj3a, obj1b, obj2b, obj3b
     obj1b, obj2b, obj3b = 1, 2, 3

diff --git a/tests/run/powop.pyx b/tests/run/powop.pyx
index 9882e938004f6b4e83705f848587f804abdaa8f4..d3765a9526734e4596b7b609954bbef74cdeb8f2 100644 (file)
--- a/tests/run/powop.pyx
+++ b/tests/run/powop.pyx
@@ -15,6 +15,10 @@ __doc__ = u"""
     True
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u"2L", u"2")
+
 def f(obj2, obj3):
     cdef float flt1, flt2, flt3
     flt2, flt3 = obj2, obj3

diff --git a/tests/run/r_addint.pyx b/tests/run/r_addint.pyx
index c828a355981b6898f6223ebfae1c8822284ba017..2d2f3095489674837363a0faa3b7a62df2255308 100644 (file)
--- a/tests/run/r_addint.pyx
+++ b/tests/run/r_addint.pyx
@@ -1,14 +1,18 @@
 __doc__ = u"""
     >>> def test(a, b):
-    ...     print a, b, add(a, b)
+    ...     print((a, b, add(a, b)))
 
     >>> test(1, 2)
-    1 2 3
+    (1, 2, 3)
     >>> test(17.3, 88.6)
-    17.3 88.6 105.9
-    >>> test("eggs", "spam")
-    eggs spam eggsspam
+    (17.3, 88.6, 105.9)
+    >>> test(u"eggs", u"spam")
+    (u'eggs', u'spam', u'eggsspam')
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u" u'", u" '")
+
 def add(x, y):
     return x + y

diff --git a/tests/run/r_barbieri1.pyx b/tests/run/r_barbieri1.pyx
index 614c8270693c4a2f43dfe0d3784d133a60ec5ee7..46815df339ad3759838245a936287b9f2538f4c8 100644 (file)
--- a/tests/run/r_barbieri1.pyx
+++ b/tests/run/r_barbieri1.pyx
@@ -8,7 +8,7 @@ __doc__ = u"""
 
 import sys
 if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u"Exception, e'", u"Exception as e")
+    __doc__ = __doc__.replace(u"Exception, e", u"Exception as e")
 
 cdef class A:
     def __cinit__(self):

diff --git a/tests/run/r_bowden1.pyx b/tests/run/r_bowden1.pyx
index e205ad10eaea2985f7cc7e0cf80814532dd93fcb..14851684fc1719af55af540bcf98f4be5d70948f 100644 (file)
--- a/tests/run/r_bowden1.pyx
+++ b/tests/run/r_bowden1.pyx
@@ -1,10 +1,14 @@
 __doc__ = u"""
 >>> f(100)
-101
+101L
 >>> g(3000000000)
-3000000001
+3000000001L
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u"L", u"")
+
 def f(x):
     cdef unsigned long long ull
     ull = x

diff --git a/tests/run/r_huss3.pyx b/tests/run/r_huss3.pyx
index 9aff6821771d9b58331fa4da05e436dfb4b81998..cb78d051538be2c1d521218a7d473b4316ca6ace 100644 (file)
--- a/tests/run/r_huss3.pyx
+++ b/tests/run/r_huss3.pyx
@@ -12,7 +12,7 @@ ValueError:
 
 import sys
 if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u"Exception, e'", u"Exception as e")
+    __doc__ = __doc__.replace(u"Exception, e", u"Exception as e")
 
 def bar():
     try: