Py3 test fixes

diff --git a/tests/run/importfrom.pyx b/tests/run/importfrom.pyx
index 5135922b61c20b6066458cb7a381a54af1a045dc..19bc40d160b899aa9ecdefdf4f52732808fb12fe 100644 (file)
--- a/tests/run/importfrom.pyx
+++ b/tests/run/importfrom.pyx
@@ -12,7 +12,7 @@ True
 True
 True
 an integer is required
-Expected tuple, got int
+Expected type, got int
 """
 
 def import1():
@@ -48,14 +48,15 @@ def import4():
 def typed_imports():
 
     import sys
+    import types
     cdef long maxunicode
-    cdef tuple t
+    cdef type t
     
     from sys import maxunicode
     print maxunicode == sys.maxunicode
-    from sys import version_info as t
-    print t is sys.version_info
-    
+    from types import ModuleType as t
+    print t is types.ModuleType
+
     try:
         from sys import version_info as maxunicode
     except TypeError, e:

diff --git a/tests/run/index.pyx b/tests/run/index.pyx
index 223e687ac5952848ca7e0aaaa56466a69e9c6010..305505ca40f06a68f77ea7e82eec605f3fba59cb 100644 (file)
--- a/tests/run/index.pyx
+++ b/tests/run/index.pyx
@@ -48,6 +48,10 @@ TypeError: 'int' object is unsubscriptable
 >>> test_long_long()
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u'is unsubscriptable', u'is not subscriptable')
+
 
 def index_tuple(tuple t, int i):
     return t[i]

diff --git a/tests/run/typedfieldbug_T303.pyx b/tests/run/typedfieldbug_T303.pyx
index 14410bd71edb95d0e1a703fb79bb1e30257c4554..4b19ef1f994f64c82f6e6c2f9ebc6ecc758fa1f2 100644 (file)
--- a/tests/run/typedfieldbug_T303.pyx
+++ b/tests/run/typedfieldbug_T303.pyx
@@ -1,4 +1,4 @@
-"""
+__doc__ = u"""
 >>> f()
 42.0
 42.0
@@ -12,9 +12,13 @@ TypeError: readonly attribute
 Traceback (most recent call last):
     ...
 SystemError: bad memberdescr type
-
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u'TypeError:', u'AttributeError:')
+
+
 cdef extern from "external_defs.h":
     ctypedef float DoubleTypedef
     ctypedef float LongDoubleTypedef