Py2.6 test fixes

diff --git a/tests/run/classkwonlyargs.pyx b/tests/run/classkwonlyargs.pyx
index 92c2eba2e41fe1a534b0168d24c7d522d9760b7c..961c78ec3793b35ef6b6e0a7f9f6bf3bec4ef86d 100644 (file)
--- a/tests/run/classkwonlyargs.pyx
+++ b/tests/run/classkwonlyargs.pyx
@@ -85,11 +85,11 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"(ELLIPSIS[^>]*Error: )[^\n]*\n", u"\\1...\n", __doc__, re.M)
 
 class Spam:

diff --git a/tests/run/extkwonlyargs.pyx b/tests/run/extkwonlyargs.pyx
index ca7efbae232436adf09c1582398165d86665cde5..5dc8306c357b515c74e061637e407a309c3d7cef 100644 (file)
--- a/tests/run/extkwonlyargs.pyx
+++ b/tests/run/extkwonlyargs.pyx
@@ -85,7 +85,7 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 cdef class Ext:

diff --git a/tests/run/extstarargs.pyx b/tests/run/extstarargs.pyx
index b0fb06ec83c9ba8d868149b2ea559a6eb8548090..454e6bde2b6cc64da07bc2bf1a759c3309b7d0af 100644 (file)
--- a/tests/run/extstarargs.pyx
+++ b/tests/run/extstarargs.pyx
@@ -89,11 +89,11 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"(ELLIPSIS[^>]*Error: )[^\n]*\n", u"\\1...\n", __doc__, re.M)
 
 cdef sorteditems(d):

diff --git a/tests/run/kwonlyargs.pyx b/tests/run/kwonlyargs.pyx
index 01bccc581757f580e6868e2f2b116c27f5aa2094..3bfd6e0f6dbe6aa099c1b66c8e4477f5d93a55cb 100644 (file)
--- a/tests/run/kwonlyargs.pyx
+++ b/tests/run/kwonlyargs.pyx
@@ -82,7 +82,7 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 def b(a, b, c):

diff --git a/tests/run/kwonlyargscall.pyx b/tests/run/kwonlyargscall.pyx
index 3f23dcd14c1db89c372366b71b7d84f4476cc77e..b7da79305ac4198f41b729db20b2a279a0f14535 100644 (file)
--- a/tests/run/kwonlyargscall.pyx
+++ b/tests/run/kwonlyargscall.pyx
@@ -82,7 +82,7 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 # the calls:

diff --git a/tests/run/r_docstrings.pyx b/tests/run/r_docstrings.pyx
index af88a5ce491e1f3ff565cd5e57abbafce3a1401f..60508fbedbda761ae4dc6d32a2aae614f146fa07 100644 (file)
--- a/tests/run/r_docstrings.pyx
+++ b/tests/run/r_docstrings.pyx
@@ -1,4 +1,4 @@
-__doc__ = u"""
+__doc__ = u"""# Python 3 gets all of these right ...
     >>> f.__doc__
     'This is a function docstring.'
 

diff --git a/tests/run/r_toofewargs.pyx b/tests/run/r_toofewargs.pyx
index 6479ca8112386c9718031c0d6475a25850486c6a..620f0ab58284d08ae57a75958f96ccba1b443046 100644 (file)
--- a/tests/run/r_toofewargs.pyx
+++ b/tests/run/r_toofewargs.pyx
@@ -5,7 +5,7 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: .*", u"Error: ...", __doc__)
 
 cdef class Spam:

diff --git a/tests/run/simpcall.pyx b/tests/run/simpcall.pyx
index 5e3f5f9e236f02af17827f07137b9f8a5d3fe31a..e8f788ae5ab385cf38da80b0b411df211dd69b39 100644 (file)
--- a/tests/run/simpcall.pyx
+++ b/tests/run/simpcall.pyx
@@ -14,7 +14,7 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: .*exactly.*", u"Error: ...", __doc__)
 
 import sys

diff --git a/tests/run/starargs.pyx b/tests/run/starargs.pyx
index 5995848af7d03c2b0464fd916fa75f48fe80af02..487d6b2f7de3e3944e438621e3efd1d9fae02da8 100644 (file)
--- a/tests/run/starargs.pyx
+++ b/tests/run/starargs.pyx
@@ -85,11 +85,11 @@ __doc__ = u"""
 """
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"Error: (.*)exactly(.*)", u"Error: \\1at most\\2", __doc__)
 
 import sys, re
-if sys.version_info[0] >= 3:
+if sys.version_info >= (2,6):
     __doc__ = re.sub(u"(ELLIPSIS[^>]*Error: )[^\n]*\n", u"\\1...\n", __doc__, re.M)
 
 cdef sorteditems(d):