various Py3 test fixes after doctest refactoring

diff --git a/tests/run/forfrom.pyx b/tests/run/forfrom.pyx
index 3e1b189aa94a3c65f4debc6b5ac524a53647a023..04baed2fd6ebf84981d442a790fc8dfc5ad63863 100644 (file)
--- a/tests/run/forfrom.pyx
+++ b/tests/run/forfrom.pyx
@@ -1,12 +1,9 @@
-import sys
-if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u" u'", u" '").replace(u' u"', u' "')
 
 def for_else():
     """
     >>> for_else()
     30
-    >>> print( u'*'.join(int_comp()) )
+    >>> print( int_comp() )
     00*01*02
     """
     cdef int i, j=0, k=2
@@ -18,5 +15,5 @@ def for_else():
 
 def int_comp():
     cdef int i
-    return tuple([ u"%02d" % i
-                   for i from 0 <= i < 3 ])
+    return u'*'.join(tuple([ u"%02d" % i
+                             for i from 0 <= i < 3 ]))

diff --git a/tests/run/index.pyx b/tests/run/index.pyx
index 6354ec4b0eb8187bb6781da9a1afcd45a82b28d5..7003755fe9fecb4328b20c48cad210039a58f1a7 100644 (file)
--- a/tests/run/index.pyx
+++ b/tests/run/index.pyx
@@ -1,9 +1,17 @@
+__doc__ = u"""
+    >>> index_object(100, 100)
+    Traceback (most recent call last):
+    ...
+    TypeError: 'int' object is unsubscriptable
+"""
+
 import sys
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u'is unsubscriptable', u'is not subscriptable')
 elif sys.version_info < (2,5):
     __doc__ = __doc__.replace(u"'int' object is unsubscriptable", u'unsubscriptable object')
 
+
 def index_tuple(tuple t, int i):
     """
     >>> index_tuple((1,1,2,3,5), 0)
@@ -52,10 +60,6 @@ def index_object(object o, int i):
     Traceback (most recent call last):
     ...
     IndexError: string index out of range
-    >>> index_object(100, 100)
-    Traceback (most recent call last):
-    ...
-    TypeError: 'int' object is unsubscriptable
     """
     return o[i]
 

diff --git a/tests/run/int_literals.pyx b/tests/run/int_literals.pyx
index 7e3d850294a0700fca6ce1de834f9becd6315b99..0654f931b22b58171ace35f18421a2930f76d782 100644 (file)
--- a/tests/run/int_literals.pyx
+++ b/tests/run/int_literals.pyx
@@ -1,13 +1,21 @@
+__doc__ = u"""
+>>> c_longs()
+(1, 1L, -1L, 18446744073709551615L)
+>>> py_longs()
+(1, 1L, 100000000000000000000000000000000L, -100000000000000000000000000000000L)
+"""
+
+import sys
+
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u'L', u'')
+
 import sys
 
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u'L', u'')
 
 def c_longs():
-    """
-    >>> c_longs()
-    (1, 1L, -1L, 18446744073709551615L)
-    """
     cdef long a = 1L
     cdef unsigned long ua = 1UL
     cdef long long aa = 0xFFFFFFFFFFFFFFFFLL
@@ -16,8 +24,4 @@ def c_longs():
     return a, ua, aa, uaa
     
 def py_longs():
-    """
-    >>> py_longs()
-    (1, 1L, 100000000000000000000000000000000L, -100000000000000000000000000000000L)
-    """
     return 1, 1L, 100000000000000000000000000000000, -100000000000000000000000000000000

diff --git a/tests/run/ishimoto2.pyx b/tests/run/ishimoto2.pyx
index d83eb45fb37b265d82407efa468b04307e5c3790..1e2d43a0b062b455f8d55d4d875561c6ba63cafe 100644 (file)
--- a/tests/run/ishimoto2.pyx
+++ b/tests/run/ishimoto2.pyx
@@ -1,6 +1,3 @@
-import sys
-if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u" u'", u" '")
 
 class C:
     """
@@ -10,8 +7,8 @@ class C:
     u'a b'
     >>> C().xxx(42)
     42
-    >>> C().xxx()
-    u'a b'
+    >>> C().xxx() == 'a b'
+    True
     """
     def xxx(self, p=u"a b"):
         return p

diff --git a/tests/run/modbody.pyx b/tests/run/modbody.pyx
index 82f6a64778d736d96d74102694949f7a8a4f0748..7ba63a68d9d378e87c16751168a52c6e31755524 100644 (file)
--- a/tests/run/modbody.pyx
+++ b/tests/run/modbody.pyx
@@ -1,18 +1,15 @@
-import sys
-if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u" u'", u" '")
 
 def f():
     """
     >>> f()
     >>> g
     42
-    >>> x
-    u'spam'
-    >>> y
-    u'eggs'
-    >>> z
-    u'spameggs'
+    >>> x == 'spam'
+    True
+    >>> y == 'eggs'
+    True
+    >>> z == 'spameggs'
+    True
     """
     pass
     

diff --git a/tests/run/new_style_exceptions.pyx b/tests/run/new_style_exceptions.pyx
index 73a29e7285845f41895ab19f6314415eb0c4484e..6506149a7010d635692a2ef84dc3d104020588f5 100644 (file)
--- a/tests/run/new_style_exceptions.pyx
+++ b/tests/run/new_style_exceptions.pyx
@@ -1,14 +1,11 @@
-import sys
-if sys.version_info[0] >= 3:
-    __doc__ = __doc__.replace(u"u'", u"'")
 
 import sys, types
 
 def test(obj):
     """
-    >>> test(Exception(u'hi'))
-    Raising: Exception(u'hi',)
-    Caught: Exception(u'hi',)
+    >>> test(Exception('hi'))
+    Raising: Exception('hi',)
+    Caught: Exception('hi',)
     """
     print u"Raising: %s%r" % (obj.__class__.__name__, obj.args)
     try:

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

diff --git a/tests/run/typedfieldbug_T303.pyx b/tests/run/typedfieldbug_T303.pyx
index 8a64444f72501bc31c1678e769bc82bbff14892d..e80b4ead13f929f6adb10a9458226a6a672a4aa8 100644 (file)
--- a/tests/run/typedfieldbug_T303.pyx
+++ b/tests/run/typedfieldbug_T303.pyx
@@ -1,3 +1,10 @@
+__doc__ = """
+>>> readonly()
+Traceback (most recent call last):
+...
+TypeError: readonly attribute
+"""
+
 import sys
 if sys.version_info[0] >= 3:
     __doc__ = __doc__.replace(u'TypeError:', u'AttributeError:')
@@ -53,11 +60,5 @@ def longdouble_access():
 
 
 def readonly():
-    """
-    >>> readonly()
-    Traceback (most recent call last):
-    ...
-    TypeError: readonly attribute
-    """
     c = MyClass()
     c.actual_double = 3