Py2.6 test fixes

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:

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:

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):

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):

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:

tests/run/r_docstrings.pyx

-__doc__ = u"""
+__doc__ = u"""# Python 3 gets all of these right ...
     >>> f.__doc__
     'This is a function docstring.'
 

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:

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

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):