Consistent Python 3 checks.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8360 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

9 files changed, 20 insertions, 20 deletions

diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 8b62ca5aa..c7112d631 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -89,7 +89,7 @@ except:
     import pdb
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
@@ -202,7 +202,7 @@ class CustomTestCase(StandardTestCase):
         """`input`, `output`, and `expected` should all be strings."""
         if isinstance(input, unicode):
             input = input.encode('raw_unicode_escape')
-        if sys.version_info > (3,):
+        if sys.version_info > (3,0):
             # API difference: Python 3's node.__str__ doesn't escape
             #assert expected is None or isinstance(expected, unicode)
             if isinstance(expected, bytes):
diff --git a/docutils/test/test__init__.py b/docutils/test/test__init__.py
index c66f97a02..d6a84f03e 100644
--- a/docutils/test/test__init__.py
+++ b/docutils/test/test__init__.py
@@ -16,7 +16,7 @@ import docutils
 import docutils.utils
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py
index 41dbfc5df..6b5073d1d 100644
--- a/docutils/test/test_error_reporting.py
+++ b/docutils/test/test_error_reporting.py
@@ -36,7 +36,7 @@ from docutils import core, parsers, frontend, utils
 from docutils.utils.error_reporting import SafeString, ErrorString, ErrorOutput
 
 oldlocale = None
-if sys.version_info < (3, 0):  # problems solved in py3k
+if sys.version_info < (3,0):  # problems solved in py3k
     try:
         import locale  # module missing in Jython
         oldlocale = locale.getlocale()
@@ -44,7 +44,7 @@ if sys.version_info < (3, 0):  # problems solved in py3k
         print('cannot test error reporting with problematic locales,\n'
               '`import locale` failed.')
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py
index 29de60c2a..d97a2eb69 100755
--- a/docutils/test/test_language.py
+++ b/docutils/test/test_language.py
@@ -26,7 +26,7 @@ _reporter = docutils.utils.new_reporter('', _settings)
 
 reference_language = 'en'
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/test/test_nodes.py b/docutils/test/test_nodes.py
index fe8d59903..a63fbed57 100755
--- a/docutils/test/test_nodes.py
+++ b/docutils/test/test_nodes.py
@@ -17,7 +17,7 @@ from DocutilsTestSupport import nodes, utils
 
 debug = False
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
@@ -36,7 +36,7 @@ class TextTests(unittest.TestCase):
         self.assertEqual(self.text.shortrepr(),
                           r"<#text: 'Line 1.\nLine 2.'>")
         self.assertEqual(nodes.reprunicode('foo'), u'foo')
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             self.assertEqual(repr(self.unicode_text), r"<#text: 'M\xf6hren'>")
         else:
             self.assertEqual(repr(self.unicode_text), u"<#text: 'Möhren'>")
@@ -65,7 +65,7 @@ class TextTests(unittest.TestCase):
         self.assertEqual(stripped2, u's noc')
 
     def test_asciirestriction(self):
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             self.assertRaises(UnicodeDecodeError, nodes.Text,
                               b'hol%s' % chr(224))
         else:
@@ -98,7 +98,7 @@ class ElementTests(unittest.TestCase):
         del element['attr']
         element['mark'] = u'\u2022'
         self.assertEqual(repr(element), '<Element: >')
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             self.assertEqual(str(element), '<Element mark="\\u2022"/>')
         else:
             self.assertEqual(str(element), u'<Element mark="\u2022"/>')
@@ -106,7 +106,7 @@ class ElementTests(unittest.TestCase):
         self.assertEqual(dom.toxml(), u'<Element mark="\u2022"/>')
         dom.unlink()
         element['names'] = ['nobody', u'имя', u'näs']
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             self.assertEqual(repr(element),
                 '<Element "nobody; \\u0438\\u043c\\u044f; n\\xe4s": >')
         else:
@@ -117,7 +117,7 @@ class ElementTests(unittest.TestCase):
         element = nodes.Element('text\nmore', nodes.Text('text\nmore'))
         uelement = nodes.Element(u'grün', nodes.Text(u'grün'))
         self.assertEqual(repr(element), r"<Element: <#text: 'text\nmore'>>")
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             self.assertEqual(repr(uelement), "<Element: <#text: 'gr\\xfcn'>>")
         else:
             self.assertEqual(repr(uelement), u"<Element: <#text: 'grün'>>")
@@ -341,7 +341,7 @@ class MiscTests(unittest.TestCase):
         self.assertTrue(isinstance(nodes.reprunicode('foo'), unicode))
         self.assertEqual(nodes.reprunicode('foo'), u'foo')
         self.assertEqual(nodes.reprunicode(u'Möhre'), u'Möhre')
-        if sys.version_info < (3,): # strip leading "u" from representation
+        if sys.version_info < (3,0): # strip leading "u" from representation
             self.assertEqual(repr(nodes.reprunicode(u'Möhre')),
                              repr(u'Möhre')[1:])
         else: # no change to `unicode` under Python 3k
@@ -350,7 +350,7 @@ class MiscTests(unittest.TestCase):
     def test_ensure_str(self):
         self.assertTrue(isinstance(nodes.ensure_str(u'über'), str))
         self.assertEqual(nodes.ensure_str('over'), 'over')
-        if sys.version_info < (3,): # strip leading "u" from representation
+        if sys.version_info < (3,0): # strip leading "u" from representation
             self.assertEqual(nodes.ensure_str(u'über'), r'\xfcber')
         else:
             self.assertEqual(nodes.ensure_str(u'über'), r'über')
diff --git a/docutils/test/test_parsers/test_parser.py b/docutils/test/test_parsers/test_parser.py
index 3ce92b2c6..ef717f833 100644
--- a/docutils/test/test_parsers/test_parser.py
+++ b/docutils/test/test_parsers/test_parser.py
@@ -23,7 +23,7 @@ class RstParserTests(unittest.TestCase):
         document = utils.new_document('test data', frontend.OptionParser(
                     components=(parser, )).get_default_values())
 
-        if sys.version_info < (3,):
+        if sys.version_info < (3,0):
             # supplying string input is supported, but only if ascii-decodable
             self.assertRaises(UnicodeDecodeError,
                               parser.parse, b'hol%s' % chr(224), document)
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
index 9b7326d5a..10e76efd4 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_include.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
@@ -16,7 +16,7 @@ from docutils.parsers.rst import states
 from docutils.utils.code_analyzer import with_pygments
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unichr = chr  # noqa
 
 
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
index ed22edc49..26f5b3550 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
@@ -18,7 +18,7 @@ from . import DocutilsTestSupport
 from docutils.parsers.rst.directives import tables
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
     unichr = chr  # noqa
 
@@ -46,10 +46,10 @@ csv_eod_error_str = 'unexpected end of data'
 if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
     csv_eod_error_str = 'newline inside string'
 # pypy adds a line number
-if sys.version_info > (2, 7) and platform.python_implementation() == 'PyPy':
+if sys.version_info >= (3,0) and platform.python_implementation() == 'PyPy':
     csv_eod_error_str = 'line 1: ' + csv_eod_error_str
 csv_unknown_url = "'bogus.csv'"
-if sys.version_info < (3, 0):
+if sys.version_info < (3,0):
     csv_unknown_url = "bogus.csv"
 
 
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
index 3ac5aa394..e2d4676df 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
@@ -14,7 +14,7 @@ import sys
 from . import DocutilsTestSupport
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unichr = chr  # noqa