Py3 test fixes

diff --git a/tests/run/for_in_range_T372.pyx b/tests/run/for_in_range_T372.pyx
index ce2a92d46a62977bd2d0de0a3fdd8f862a9a348a..a8fa40d56a6925b694f40873e5683711c0944c00 100644 (file)
--- a/tests/run/for_in_range_T372.pyx
+++ b/tests/run/for_in_range_T372.pyx
@@ -1,15 +1,30 @@
 __doc__ = u"""
 >>> test_modify()
-0 1 2 3 4
+0
+1
+2
+3
+4
+<BLANKLINE>
 (4, 0)
 >>> test_fix()
-0 1 2 3 4
+0
+1
+2
+3
+4
+<BLANKLINE>
 4
 >>> test_break()
-0 1 2
+0
+1
+2
+<BLANKLINE>
 (2, 0)
 >>> test_return()
-0 1 2
+0
+1
+2
 (2, 0)
 """
 
@@ -20,7 +35,7 @@ cimport cython
 def test_modify():
     cdef int i, n = 5
     for i in range(n):
-        print i,
+        print i
         n = 0
     print
     return i,n
@@ -30,7 +45,7 @@ def test_modify():
 def test_fix():
     cdef int i
     for i in range(5):
-        print i,
+        print i
     print
     return i
 
@@ -39,10 +54,12 @@ def test_fix():
 def test_break():
     cdef int i, n = 5
     for i in range(n):
-        print i,
+        print i
         n = 0
         if i == 2:
             break
+    else:
+        print "FAILED!"
     print
     return i,n
 
@@ -51,7 +68,7 @@ def test_break():
 def test_return():
     cdef int i, n = 5
     for i in range(n):
-        print i,
+        print i
         n = 0
         if i == 2:
             return i,n

diff --git a/tests/run/jarausch1.pyx b/tests/run/jarausch1.pyx
index 0c8e3cc9a43850e0eedbb25cc804b7a0d36373db..9081c25e60544e4dbe1faada685dc25cbb1eae39 100644 (file)
--- a/tests/run/jarausch1.pyx
+++ b/tests/run/jarausch1.pyx
@@ -1,10 +1,18 @@
 __doc__ = u"""
-   >>> py_x = br'\\\\'
-   >>> assert x == py_x
+   >>> b == br'\\\\'
+   True
+   >>> s ==  r'\\\\'
+   True
+   >>> u == ur'\\\\'
+   True
 """
 
 import sys
 if sys.version_info[0] < 3:
     __doc__ = __doc__.replace(u" br'", u" r'")
+else:
+    __doc__ = __doc__.replace(u" ur'", u" r'")
 
-x = r'\\'
+b = br'\\'
+s =  r'\\'
+u = ur'\\'

diff --git a/tests/run/kostyrka2.pyx b/tests/run/kostyrka2.pyx
index bd6b076c37b1a2e78c5aadd62e31f8b210c4374c..b89758e302e75a265c40d62c6f46b8fbe9017988 100644 (file)
--- a/tests/run/kostyrka2.pyx
+++ b/tests/run/kostyrka2.pyx
@@ -1,12 +1,8 @@
 __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/literalslice.pyx b/tests/run/literalslice.pyx
index d7102b6caa6e34f5614f91980a96bfaa1262caa8..901ee890e381406ad8320841feedfb29fbc0c702 100644 (file)
--- a/tests/run/literalslice.pyx
+++ b/tests/run/literalslice.pyx
@@ -1,6 +1,6 @@
 __doc__ = u"""
   >>> test_str(1)
-  b'b'
+  'b'
 
   >>> test_unicode_ascii(2)
   u'c'
@@ -10,14 +10,14 @@ __doc__ = u"""
   >>> test_int_list(2)
   3
   >>> test_str_list(1)
-  b'bcd'
+  'bcd'
 
   >>> test_int_tuple(2)
   3
   >>> test_str_tuple(0)
-  b'a'
+  'a'
   >>> test_mix_tuple(1)
-  b'abc'
+  'abc'
   >>> test_mix_tuple(0)
   1
 """
@@ -30,10 +30,7 @@ else:
     __doc__ = __doc__.replace(u" b'", u" '")
 
 def test_str(n):
-    if IS_PY3:
-        return bytes(["abcd"[n]])
-    else:
-        return "abcd"[n]
+    return "abcd"[n]
 
 def test_unicode_ascii(n):
     return u"abcd"[n]

diff --git a/tests/run/r_vree_1.pyx b/tests/run/r_vree_1.pyx
index fc4a5bc2fb31d310003df698bcd9ec2ee06c01ac..1a14c2685b808f8f4446441faf1c94faae0b02c9 100644 (file)
--- a/tests/run/r_vree_1.pyx
+++ b/tests/run/r_vree_1.pyx
@@ -1,10 +1,13 @@
-__doc__ = """# disabled in Py3
+
+import sys
+if sys.version_info[0] < 3:
+    __doc__ = u"""
+
     >>> test(0)
     0L
     >>> test(1)
     1L
 
-    >>> import sys
     >>> sys.maxint + 1 > sys.maxint
     True
     >>> type(sys.maxint * 2 + 1) is long
@@ -19,7 +22,16 @@ __doc__ = """# disabled in Py3
     True
     >>> test(256 ** unsigned_long_size() - 1) > sys.maxint
     True
-"""
+    """
+else:
+    __doc__ = u"""
+    >>> test(0)
+    0
+    >>> test(1)
+    1
+    >>> test(256 ** unsigned_long_size() - 1) > 0
+    True
+    """
 
 def test(k):
     cdef unsigned long m

diff --git a/tests/run/unicodeliterals.pyx b/tests/run/unicodeliterals.pyx
index 75235709922a395b649e76d5eecc1891b17daa99..0553f255fc1038375c46db1053746a690eac320f 100644 (file)
--- a/tests/run/unicodeliterals.pyx
+++ b/tests/run/unicodeliterals.pyx
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-__doc__ = r"""
+__doc__ = br"""
     >>> sa
-    b'abc'
+    'abc'
     >>> ua
     u'abc'
     >>> b
@@ -19,7 +19,7 @@ __doc__ = r"""
     u'S\xf8k ik\xfc\xd6\xe4abc'
     >>> null
     u'\x00'
-""".decode(u"ASCII") + """
+""".decode("ASCII") + b"""
     >>> len(sa)
     3
     >>> len(ua)
@@ -38,7 +38,7 @@ __doc__ = r"""
     12
     >>> len(null)
     1
-""".decode(u"ASCII") + u"""
+""".decode("ASCII") + u"""
     >>> ua == u'abc'
     True
     >>> b == u'123'

diff --git a/tests/run/unicodeliteralsdefault.pyx b/tests/run/unicodeliteralsdefault.pyx
index 9f185c19502c437d962e1ae8ca3b0cd1014969fa..18737d5467be912bb0d81bcbfa60aa54a55d76c2 100644 (file)
--- a/tests/run/unicodeliteralsdefault.pyx
+++ b/tests/run/unicodeliteralsdefault.pyx
@@ -6,9 +6,9 @@
 # This file is written in UTF-8, but it has no encoding declaration,
 # so it just defaults to UTF-8 (PEP 3120).
 
-__doc__ = r"""
+__doc__ = br"""
     >>> sa
-    b'abc'
+    'abc'
     >>> ua
     u'abc'
     >>> b
@@ -25,7 +25,7 @@ __doc__ = r"""
     u'S\xf8k ik\xfc\xd6\xe4abc'
     >>> null
     u'\x00'
-""".decode(u"ASCII") + """
+""".decode("ASCII") + b"""
     >>> len(sa)
     3
     >>> len(ua)
@@ -44,7 +44,7 @@ __doc__ = r"""
     12
     >>> len(null)
     1
-""".decode(u"ASCII") + u"""
+""".decode("ASCII") + u"""
     >>> ua == u'abc'
     True
     >>> b == u'123'

diff --git a/tests/run/unicodeliteralslatin1.pyx b/tests/run/unicodeliteralslatin1.pyx
index 45ac6c16c8801145c64fd9328d63f56b5b9cd7f7..46f708ae7dfcdf0c182119453891376ea8eeb3f1 100644 (file)
--- a/tests/run/unicodeliteralslatin1.pyx
+++ b/tests/run/unicodeliteralslatin1.pyx
@@ -1,8 +1,8 @@
 # -*- coding: latin-1 -*-
 
-__doc__ = r"""
+__doc__ = br"""
     >>> sa
-    b'abc'
+    'abc'
     >>> ua
     u'abc'
     >>> b
@@ -19,7 +19,7 @@ __doc__ = r"""
     u'S\xf8k ik\xfc\xd6\xe4abc'
     >>> null
     u'\x00'
-""".decode(u"ASCII") + """
+""".decode("ASCII") + b"""
     >>> len(sa)
     3
     >>> len(ua)
@@ -38,7 +38,7 @@ __doc__ = r"""
     12
     >>> len(null)
     1
-""".decode(u"ASCII") + u"""
+""".decode("ASCII") + u"""
     >>> ua == u'abc'
     True
     >>> b == u'123'