tons of fixes for the test suite: docstrings must be unicode strings to run in...

tons of fixes for the test suite: docstrings must be unicode strings to run in Py3's doctest (obviously...)

--HG--
rename : tests/compile/withnogil.pyx => tests/run/withnogil.pyx

tests/compile/classmethargdefault.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Swallow()
     >>> s.spam(1)
     1 42 'grail' True

tests/compile/pinard4.pyx

-__doc__ = """
+__doc__ = u"""
     >>> fiches_CP
     []
 """

tests/run/__getattribute__.pyx

-__doc__ = """
+__doc__ = u"""
 __getattribute__ and __getattr__ special methods for a single class.
 
     >>> a = just_getattribute()

tests/run/__getattribute_subclasses__.pyx

-__doc__ = """
+__doc__ = u"""
 __getattribute__ and __getattr__ special methods and subclasses. 
 
 getattr does not override members. 

tests/run/addloop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> x = 1
     >>> for i in range(10):
     ...     x = x + i

tests/run/addop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     (30, 22)
 """

tests/run/addressof.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(5)
     5
 """

tests/run/altet2.pyx

-__doc__ = """
+__doc__ = u"""
   >>> iter(C())
   Traceback (most recent call last):
   TypeError: iter() returned non-iterator of type 'NoneType'

tests/run/append.pyx

-__doc__ = """
+__doc__ = u"""
 >>> test_append([])
 None
 None

tests/run/ass2global.pyx

-__doc__ = """
+__doc__ = u"""
     >>> getg()
     5
     >>> f(42)

tests/run/ass2local.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     42
 """

tests/run/assert.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1, 2, 1)
     >>> f(0, 2, 1)
     Traceback (most recent call last):

tests/run/attr.pyx

-__doc__ = """
+__doc__ = u"""
     >>> class Test:
     ...     def __init__(self, i):
     ...         self.i = i

tests/run/baas3.pyx

-__doc__ = """
+__doc__ = u"""
     >>> m = MyClass()
     >>> m is foo(m)
     True

tests/run/backquote.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(20)
     '20'
     >>> f('test')

tests/run/behnel1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> viking(5)
     5
 """

tests/run/behnel2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> y
     1
     >>> y and {}

tests/run/behnel3.pyx

-__doc__ = """
+__doc__ = u"""
     >>> y
     >>> y or {}
     {}

tests/run/bishop1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> m = fmatrix()
     >>> m[1] = True
     >>> m.getfoo()

tests/run/bishop2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f = foo()
     >>> 'a' in f
     True

tests/run/boolop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> foo(True, False, 23, 'test', 1)
     (0, 1, False, False)
 """

tests/run/cfuncdef.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test()
 """
 

tests/run/cintop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> int2 = 42
     >>> int3 = 7
     >>> char1 = ord('C')

tests/run/classkwonlyargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> spam = Spam()
     >>> b,c,d,e,f,g,h,k = spam.b,spam.c,spam.d,spam.e,spam.f,spam.g,spam.h,spam.k
 

tests/run/classpass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Spam()
     >>> print s.__class__.__name__
     Spam

tests/run/compiledef.pyx

-__doc__ = """
+__doc__ = u"""
     >>> t
     True
     >>> f

tests/run/concatcstrings.pyx

-__doc__ = """
+__doc__ = u"""
     >>> spam == "C string 1" + "C string 2"
     True
 """

tests/run/cstringmul.pyx

-__doc__ = """
-    >>> print spam
+__doc__ = u"""
+    >>> print(spam)
     eggseggseggseggs
-    >>> print grail
+    >>> print(grail)
     tomatotomatotomatotomatotomatotomatotomato
 """
 

tests/run/cstruct.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test_i()
     >>> test_c()
     >>> test_p()

tests/run/ct_DEF.pyx

-__doc__ = """
+__doc__ = u"""
     >>> c()
     120
     >>> i0() == -1

tests/run/ct_IF.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     1
     >>> g()

tests/run/cunion.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test_i()
     >>> test_c()
     >>> test_p()

tests/run/cvardef.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
 """
 

tests/run/dict.pyx

-__doc__ = """
+__doc__ = u"""
     >>> empty()
     {}
     >>> keyvalue(1, 2)

tests/run/dietachmayer1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test()
     1.0
 """

tests/run/exarkun.pyx

-__doc__ = """
+__doc__ = u"""
     >>> p = Point(1,2,3)
     >>> p.gettuple()
     (1.0, 2.0, 3.0)

tests/run/extclasspass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> e = Eggs()
     >>> print type(e).__name__
     Eggs

tests/run/extinherit.pyx

-__doc__ = """
+__doc__ = u"""
     >>> p = create()
     >>> rest(p)
     0

tests/run/extinstantiate.pyx

-__doc__ = """
+__doc__ = u"""
     >>> print type(f()).__name__
     Spam
 """

tests/run/extkwonlyargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> ext = Ext()
     >>> b,c,d,e,f,g,h,k = ext.b,ext.c,ext.d,ext.e,ext.f,ext.g,ext.h,ext.k
 

tests/run/extlen.pyx

-__doc__ = """
+__doc__ = u"""
     >>> len(Spam())
     0
 """

tests/run/extstarargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Silly(1,2,3, 'test')
     >>> (spam,grail,swallow,creosote,onlyt,onlyk,tk) = (
     ...     s.spam,s.grail,s.swallow,s.creosote,s.onlyt,s.onlyk,s.tk)

tests/run/exttype.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Spam(12)
     >>> s.eat()
     12 42

tests/run/getattr3call.pyx

-__doc__ = """
+__doc__ = u"""
     >>> class test(object): a = 1
     >>> t = test()
 

tests/run/if.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(0,0)
     0
     >>> f(1,2)

tests/run/include.pyx

-__doc__ = """
+__doc__ = u"""
     >>> D
     2
 """

tests/run/inop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1,[1,2,3])
     True
     >>> f(5,[1,2,3])

tests/run/ishimoto2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> C().xxx(5)
     5
     >>> C().xxx()

tests/run/ishimoto3.pyx

-__doc__ = """
+__doc__ = u"""
     >>> c1 = C1()
     >>> c2 = C2(c1)
     >>> c1 is c2.getc1()

tests/run/isnonebool.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test_and(None, None)
     True
     >>> test_and(None, 1)

tests/run/jarausch1.pyx

-__doc__ = """
+__doc__ = u"""
    >>> py_x = r'\\\\'
    >>> assert x == py_x
 """

tests/run/kostyrka.pyx

-__doc__ = """
+__doc__ = u"""
     >>> t = TEST()
     >>> 1 in t
     True

tests/run/kostyrka2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> x = X()
     >>> x.slots
     ['']

tests/run/kwargproblems.pyx

-__doc__ = """
+__doc__ = u"""
     >>> d = {1 : 2}
     >>> test(**d)
     Traceback (most recent call last):

tests/run/kwonlyargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> b(1,2,3)
     >>> b(1,2,3,4)
     Traceback (most recent call last):

tests/run/lepage_1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> a = A(1,2,3)
     >>> a[0]
     1.0

tests/run/list.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1, 2, 3, 4, 5)
     []
     >>> g(1, 2, 3, 4, 5)

tests/run/literals.pyx

-__doc__ = """
+__doc__ = u"""
     >>> foo()
 """
 

tests/run/modbody.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     >>> g
     42

tests/run/modop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> modobj(9,2)
     1
     >>> modobj('%d', 5)

tests/run/multass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     (1, 2, 1, 2)
     >>> g()

tests/run/new_style_exceptions.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test(Exception('hi'))
     Raising: Exception('hi',)
     Caught: Exception('hi',)

tests/run/notinop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1,[1,2,3])
     False
     >>> f(5,[1,2,3])

tests/run/pass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
 """
 

tests/run/pinard5.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test()
     1
 """

tests/run/pinard6.pyx

-__doc__ = """
+__doc__ = u"""
     >>> x
     (1, 2)
 """

tests/run/pinard7.pyx

-__doc__ = """
+__doc__ = u"""
     >>> c = build()
     >>> c.method()
     Traceback (most recent call last):

tests/run/pinard8.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f = Fiche()
     >>> f[0] = 1
     >>> f.geti()

tests/run/powop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1.0, 2.95)[0] == f(1.0, 2.95)[1]
     True
 

tests/run/print.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1, 'test')
     <BLANKLINE>
     1

tests/run/pycmp.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     >>> g()
 """

tests/run/pyextattrref.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Spam(Eggs("ham"))
     >>> test(s)
     'ham'

tests/run/pyintop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1,2,3)
     3
     >>> g(1,2,3)

tests/run/pylistsubtype.pyx

-__doc__ = """
+__doc__ = u"""
     >>> l1 = Sub1([1,2,3])
     >>> len(l1)
     3

tests/run/pynumop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     6
     >>> g()

tests/run/r_addint.pyx

-__doc__ = """
+__doc__ = u"""
     >>> def test(a, b):
     ...     print a, b, add(a, b)
 

tests/run/r_argdefault.pyx

-__doc__ = """
+__doc__ = u"""
   >>> swallow(name = "Brian")
   This swallow is called Brian
   >>> swallow(airspeed = 42)

tests/run/r_barbieri1.pyx

-__doc__ = """
+__doc__ = u"""
   >>> try:
   ...     B()
   ... except Exception, e:

tests/run/r_bishop3.pyx

-__doc__ = """
-foo = Foo()
-fee = Fee()
-faa = Faa()
-fee.bof()
-faa.bof()
+__doc__ = u"""
+>>> foo = Foo()
+>>> fee = Fee()
+>>> faa = Faa()
+>>> fee.bof()
+Fee bof 0
+>>> faa.bof()
+Foo bof 0
 """
 
 cdef class Foo:

tests/run/r_bowden1.pyx

-__doc__ = """
-print f(100)
-print g(3000000000)
+__doc__ = u"""
+>>> print f(100)
+101
+>>> print g(3000000000)
+3000000001
 """
 
 def f(x):

tests/run/r_delgado_1.pyx

-__doc__ = """
+__doc__ = u"""
 try:
     eggs().eat()
 except RuntimeError, e:

tests/run/r_docstrings.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f.__doc__
     'This is a function docstring.'
 

tests/run/r_extcomplex2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> c = eggs()
     >>> print "eggs returned:", c
     eggs returned: (17+42j)

tests/run/r_extstarargs.pyx

-__doc__ = """
+__doc__ = u"""
   >>> s = Swallow("Brian", 42)
   Name: Brian
   Airspeed: 42

tests/run/r_forloop.pyx

-__doc__ = """
+__doc__ = u"""
   >>> go()
   Spam!
   Spam!

tests/run/r_hordijk1.pyx

-__doc__ = """
+__doc__ = u"""
   >>> try:
   ...     s = Spam()
   ... except StandardError, e:

tests/run/r_huss3.pyx

-__doc__ = """
-try:
-    foo()
-except Exception, e:
-    print "%s: %s" % (e.__class__.__name__, e)
+__doc__ = u"""
+>>> try:
+...     foo()
+... except Exception, e:
+...     print "%s: %s" % (e.__class__.__name__, e)
+ValueError: 
+>>> try:
+...     bar()
+... except Exception, e:
+...     print "%s: %s" % (e.__class__.__name__, e)
 """
 
 def bar():

tests/run/r_jeff_epler_1.pyx

-__doc__ = """
-print r_jeff_epler_1.blowup([2, 3, 5])
+__doc__ = u"""
+    >>> blowup([2, 3, 5])
+    1
 """
 
 def blowup(p):

tests/run/r_jiba1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test()
     This parrot is resting.
     Lovely plumage!

tests/run/r_lepage_3.pyx

-__doc__ = """
+__doc__ = u"""
 g = r_lepage_3.Grail()
 g("spam", 42, ["tomato", "sandwich"])
 """

tests/run/r_mang1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> import re
     >>> t
     ('2',)

tests/run/r_mcintyre1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> b = Bicycle()
     >>> b.fall_off()
     Falling off extremely hard

tests/run/r_mitch_chapman_2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> boolExpressionsFail()
     'Not 2b'
 """

tests/run/r_primes.pyx

-__doc__ = """
+__doc__ = u"""
     >>> print primes(20)
     [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71]
 """

tests/run/r_print.pyx

-__doc__ = """
+__doc__ = u"""
   >>> frighten()
   NOBODY expects the Spanish Inquisition!
 """

tests/run/r_pyclass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> order()
     42 tons of spam!
 """

tests/run/r_pyclassdefault.pyx

-__doc__ = """
+__doc__ = u"""
   >>> c = CoconutCarrier()
   >>> c.swallow(name = "Brian")
   This swallow is called Brian

tests/run/r_pythonapi.pyx

-__doc__ = """
+__doc__ = u"""
     >>> x = spam()
     >>> print repr(x)
     'Ftang\\x00Ftang!'

tests/run/r_spamtype.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Spam()
     >>> print s.get_tons()
     17

tests/run/r_starargcall.pyx

-__doc__ = """
+__doc__ = u"""
     >>> eggs()
     Args: 1 2 3
     Args: buckle my shoe

tests/run/r_starargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> swallow("Brian", 42)
     Name: Brian
     Airspeed: 42

tests/run/r_starargsonly.pyx

-__doc__ = """
+__doc__ = u"""
     >>> spam()
     Args: ()
     >>> spam(42)

tests/run/r_toofewargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> s = Spam()
     Traceback (most recent call last):
     TypeError: function takes exactly 3 arguments (0 given)

tests/run/r_vree_1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test(0)
     0L
     >>> test(1)

tests/run/ref2local.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     42
 """

tests/run/return.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f('test')
     >>> test_g()
     >>> test_h(5)

tests/run/rodriguez_1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> b = B()
     >>> b.t
     {1: ((1, 2, 3),), 2: (1, 2, 3)}

tests/run/simpcall.pyx

-__doc__ = """
+__doc__ = u"""
     >>> z(1,9.2,'test')
     >>> failtype()
     Traceback (most recent call last):

tests/run/sizeof.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
 """
 

tests/run/slice2.pyx

-__doc__ = """
+__doc__ = u"""
     >>> l = [1,2,3,4]
 
     >>> f(1, l, 2, 3)

tests/run/slice3.pyx

-__doc__ = """
+__doc__ = u"""
     >>> class Test(object):
     ...     def __setitem__(self, key, value):
     ...         print key, value

tests/run/specialfloat.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     12.5
 

tests/run/starargs.pyx

-__doc__ = """
+__doc__ = u"""
     >>> spam(1,2,3)
     (1, 2, 3)
     >>> spam(1,2)

tests/run/strconstinclass.pyx

-__doc__ = """
+__doc__ = u"""
     >>> c = C()
     >>> print c.x
     foo

tests/run/strfunction.pyx

-__doc__ = """
+__doc__ = u"""
    >>> s('test')
    'test'
    >>> z
@@ -16,20 +16,26 @@ __doc__ = """
 #   'testing a subtype'
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    encoding = {'encoding' : 'ASCII'}
+else:
+    encoding = {}
+
 s = str
-z = str('test')
+z = str('test', **encoding)
 
 def c(string):
-    return str(string)
+    return str(string, **encoding)
 
 class subs(str):
     pass
 
 def sub(string):
-    return subs(string)
+    return subs(string, **encoding)
 
 #cdef class subs(str):
 #    pass
 
 #def csub(string):
-#    return csubs(string)
+#    return csubs(string, **encoding)

tests/run/subop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f()
     (-1, -1)
     >>> p()

tests/run/tuple.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1,2,3,4,5)
     ()
     >>> g(1,2,3,4,5)

tests/run/tuplereassign.pyx

-__doc__ = """
+__doc__ = u"""
     >>> test1( (1,2,3) )
     1
     >>> test3( (1,2,3) )

tests/run/unicodefunction.pyx

-__doc__ = """
+__doc__ = u"""
    >>> u('test')
    u'test'
    >>> z
@@ -16,6 +16,10 @@ __doc__ = """
 #   u'testing a C subtype'
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u" u'", u" '")
+
 u = unicode
 z = unicode('test')
 

tests/run/unop.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1, 2, 3)
     (-3, -4, 1)
 """

tests/run/unpack.pyx

-__doc__ = """
+__doc__ = u"""
     >>> f(1, (2,), (3,4,5), (6,(7,(8,9))), 0)
     (8, 9, (8, 9), (6, (7, (8, 9))), 0)
 """

tests/run/unpacklistcomp.pyx

-__doc__ = """
+__doc__ = u"""
     >>> unpack_normal([1,2])
     (1, 2)
     >>> unpack_normal([1,2,3]) # doctest: +ELLIPSIS

tests/run/varargcall.pyx

-__doc__ = """
+__doc__ = u"""
     >>> swallow()
 """
 

tests/compile/withnogil.pyx → tests/run/withnogil.pyx

-cdef object f(object x):
+__doc__ = u"""
+    >>> f(1)
+    (1, 17)
+    >>> g()
+    1
+"""
+
+def f(x):
     cdef int y
-    #z = 42
+    z = 42
     with nogil:
-        pass#y = 17
-    #z = 88
+        y = 17
+    z = x
+    return z,y
 
-cdef object g():
+def g():
     with nogil:
         h()
+    return 1
 
 cdef int h() except -1:
     pass

tests/run/wundram1.pyx

-__doc__ = """
+__doc__ = u"""
     >>> x
     5L
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    __doc__ = __doc__.replace(u"5L'", u"5")
+
 cdef unsigned int ui
 ui = 5
 x = ui