more test fixes

diff --git a/tests/run/append.pyx b/tests/run/append.pyx
index 95ac182ada6c446df04e70675585b92d28ca1bf2..d8d72ce17ee84abe9f2e9ac9d43d5aa49125b0c5 100644 (file)
--- a/tests/run/append.pyx
+++ b/tests/run/append.pyx
@@ -23,7 +23,7 @@ None
 
 class A:
     def append(self, x):
-        print "appending"
+        print u"appending"
         return x
         
 class B(list):
@@ -38,6 +38,6 @@ def test_append(L):
     try:
         print L.append(5,6)
     except TypeError:
-        print "got error"
+        print u"got error"
     return L
 

diff --git a/tests/run/r_mcintyre1.pyx b/tests/run/r_mcintyre1.pyx
index 82d365e83fd5bc7a0c34ff94d7deac407949b585..dd4e0561b3e19baa3f953713ad0f02d787fa42ac 100644 (file)
--- a/tests/run/r_mcintyre1.pyx
+++ b/tests/run/r_mcintyre1.pyx
@@ -8,5 +8,5 @@ __doc__ = u"""
 
 class Bicycle:
 
-    def fall_off(self, how_hard = "extremely"):
-        print "Falling off", how_hard, "hard"
+    def fall_off(self, how_hard = u"extremely"):
+        print u"Falling off", how_hard, u"hard"

diff --git a/tests/run/r_pyclassdefault.pyx b/tests/run/r_pyclassdefault.pyx
index bc83f49f7f16f16d3fc752651c4053a0672910c8..bb36727bd83acd84fa0eeac18df32827428a9757 100644 (file)
--- a/tests/run/r_pyclassdefault.pyx
+++ b/tests/run/r_pyclassdefault.pyx
@@ -14,6 +14,6 @@ class CoconutCarrier:
         if name is not None:
             print u"This swallow is called", name
         if airspeed is not None:
-            print u"This swallow is flying at", airspeed, "furlongs per fortnight"
+            print u"This swallow is flying at", airspeed, u"furlongs per fortnight"
         if coconuts is not None:
-            print u"This swallow is carrying", coconuts, "coconuts"
+            print u"This swallow is carrying", coconuts, u"coconuts"

diff --git a/tests/run/strconstinclass.pyx b/tests/run/strconstinclass.pyx
index bfde9de095de44de9cb599b6fcd169656271a062..945acba7145221e723f417864b7ea86fce763e3b 100644 (file)
--- a/tests/run/strconstinclass.pyx
+++ b/tests/run/strconstinclass.pyx
@@ -1,9 +1,13 @@
 __doc__ = u"""
     >>> c = C()
-    >>> print(c.x)
-    foo
+    >>> c.x
+    b'foo'
 """
 
+import sys
+if sys.version_info[0] < 3:
+    __doc__ = __doc__.replace(u" b'", u" '")
+
 class C:
     x = "foo"
 

diff --git a/tests/run/strfunction.pyx b/tests/run/strfunction.pyx
index 3f0ca9d5e29ccaaeb7f2f33f6855849e68bef74d..9b7964bd6010a78a4fcc31ad4da1c60c902a78b8 100644 (file)
--- a/tests/run/strfunction.pyx
+++ b/tests/run/strfunction.pyx
@@ -24,7 +24,7 @@ else:
     __doc__ = __doc__.replace(u" b'", u" '")
 
 s = str
-z = str('test', **encoding)
+z = str('test')
 
 def c(string):
     return str(string, **encoding)

diff --git a/tests/run/unicodefunction.pyx b/tests/run/unicodefunction.pyx
index 282847918dc8fa3ec4e2ae3f145c156de62755e4..1d20bef78664a5d6fb2b304b1bdde29ad416fad8 100644 (file)
--- a/tests/run/unicodefunction.pyx
+++ b/tests/run/unicodefunction.pyx
@@ -21,7 +21,7 @@ if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u" u'", u" '")
 
 u = unicode
-z = unicode('test')
+z = unicode(u'test')
 
 def c(string):
     return unicode(string)

diff --git a/tests/run/unicodeliterals.pyx b/tests/run/unicodeliterals.pyx
index 2d08606e09be57e9da7eaf0e6683ded3c751c2a5..75235709922a395b649e76d5eecc1891b17daa99 100644 (file)
--- a/tests/run/unicodeliterals.pyx
+++ b/tests/run/unicodeliterals.pyx
@@ -2,7 +2,7 @@
 
 __doc__ = r"""
     >>> sa
-    'abc'
+    b'abc'
     >>> ua
     u'abc'
     >>> b
@@ -39,8 +39,6 @@ __doc__ = r"""
     >>> len(null)
     1
 """.decode(u"ASCII") + u"""
-    >>> sa == 'abc'
-    True
     >>> ua == u'abc'
     True
     >>> b == u'123'
@@ -66,6 +64,8 @@ __doc__ = r"""
 import sys
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u" u'", u" '")
+else:
+    __doc__ = __doc__.replace(u" b'", u" '")
 
 sa = 'abc'
 ua = u'abc'

diff --git a/tests/run/unicodeliteralsdefault.pyx b/tests/run/unicodeliteralsdefault.pyx
index 05129fd315aec19b9ea5e56138f78aba5f511c76..9f185c19502c437d962e1ae8ca3b0cd1014969fa 100644 (file)
--- a/tests/run/unicodeliteralsdefault.pyx
+++ b/tests/run/unicodeliteralsdefault.pyx
@@ -8,7 +8,7 @@
 
 __doc__ = r"""
     >>> sa
-    'abc'
+    b'abc'
     >>> ua
     u'abc'
     >>> b
@@ -45,8 +45,6 @@ __doc__ = r"""
     >>> len(null)
     1
 """.decode(u"ASCII") + u"""
-    >>> sa == 'abc'
-    True
     >>> ua == u'abc'
     True
     >>> b == u'123'
@@ -72,6 +70,8 @@ __doc__ = r"""
 import sys
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u" u'", u" '")
+else:
+    __doc__ = __doc__.replace(u" b'", u" '")
 
 sa = 'abc'
 ua = u'abc'

diff --git a/tests/run/unicodeliteralslatin1.pyx b/tests/run/unicodeliteralslatin1.pyx
index ed0817dcc2bae28f8dfce8817b8a7bcfc637c087..45ac6c16c8801145c64fd9328d63f56b5b9cd7f7 100644 (file)
--- a/tests/run/unicodeliteralslatin1.pyx
+++ b/tests/run/unicodeliteralslatin1.pyx
@@ -2,7 +2,7 @@
 
 __doc__ = r"""
     >>> sa
-    'abc'
+    b'abc'
     >>> ua
     u'abc'
     >>> b
@@ -39,8 +39,6 @@ __doc__ = r"""
     >>> len(null)
     1
 """.decode(u"ASCII") + u"""
-    >>> sa == 'abc'
-    True
     >>> ua == u'abc'
     True
     >>> b == u'123'
@@ -66,6 +64,8 @@ __doc__ = r"""
 import sys
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u" u'", u" '")
+else:
+    __doc__ = __doc__.replace(u" b'", u" '")
 
 sa = 'abc'
 ua = u'abc'