Consistent Python 3 checks.

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

16 files changed, 28 insertions, 28 deletions

diff --git a/docutils/frontend.py b/docutils/frontend.py
index 692dc8fcc..f0f586299 100644
--- a/docutils/frontend.py
+++ b/docutils/frontend.py
@@ -43,7 +43,7 @@ import docutils.nodes
 from docutils.utils.error_reporting import (locale_encoding, SafeString,
                                             ErrorOutput, ErrorString)
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
@@ -775,7 +775,7 @@ Skipping "%s" configuration file.
             except IOError:
                 continue
             try:
-                if sys.version_info < (3, 0):
+                if sys.version_info < (3,0):
                     CP.RawConfigParser.readfp(self, fp, filename)
                 else:
                     CP.RawConfigParser.read_file(self, fp, filename)
diff --git a/docutils/io.py b/docutils/io.py
index fffc5b359..b886840fa 100644
--- a/docutils/io.py
+++ b/docutils/io.py
@@ -17,7 +17,7 @@ import codecs
 from docutils import TransformSpec
 from docutils.utils.error_reporting import locale_encoding, ErrorString, ErrorOutput
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
@@ -208,7 +208,7 @@ class FileInput(Input):
     def __init__(self, source=None, source_path=None,
                  encoding=None, error_handler='strict',
                  autoclose=True,
-                 mode='r' if sys.version_info >= (3, 4) else 'rU', **kwargs):
+                 mode='r' if sys.version_info >= (3,0) else 'rU', **kwargs):
         """
         :Parameters:
             - `source`: either a file-like object (which is read directly), or
diff --git a/docutils/nodes.py b/docutils/nodes.py
index 2615e3cfe..74a7c62ef 100644
--- a/docutils/nodes.py
+++ b/docutils/nodes.py
@@ -29,7 +29,7 @@ import re
 import warnings
 import unicodedata
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
     basestring = str  # noqa
 
@@ -64,7 +64,7 @@ class Node(object):
         """
         return True
 
-    if sys.version_info < (3, 0):
+    if sys.version_info < (3,0):
         # on 2.x, str(node) will be a byte string with Unicode
         # characters > 255 escaped; on 3.x this is no longer necessary
         def __str__(self):
@@ -304,7 +304,7 @@ class Node(object):
         except IndexError:
             return None
 
-if sys.version_info < (3, 0):
+if sys.version_info < (3,0):
     class reprunicode(unicode):
         """
         A unicode sub-class that removes the initial u from unicode's repr.
@@ -320,7 +320,7 @@ def ensure_str(s):
     """
     Failsave conversion of `unicode` to `str`.
     """
-    if sys.version_info < (3,) and isinstance(s, unicode):
+    if sys.version_info < (3,0) and isinstance(s, unicode):
         return s.encode('ascii', 'backslashreplace')
     return s
 
@@ -352,7 +352,7 @@ class Text(Node, reprunicode):
     children = ()
     """Text nodes have no children, and cannot have children."""
 
-    if sys.version_info > (3,):
+    if sys.version_info > (3,0):
         def __new__(cls, data, rawsource=None):
             """Prevent the rawsource argument from propagating to str."""
             if isinstance(data, bytes):
@@ -544,7 +544,7 @@ class Element(Node):
         else:
             return self.emptytag()
 
-    if sys.version_info > (3,):
+    if sys.version_info > (3,0):
         # 2to3 doesn't convert __unicode__ to __str__
         __str__ = __unicode__
 
diff --git a/docutils/parsers/rst/directives/__init__.py b/docutils/parsers/rst/directives/__init__.py
index 6b6e022f7..1399dab9c 100644
--- a/docutils/parsers/rst/directives/__init__.py
+++ b/docutils/parsers/rst/directives/__init__.py
@@ -16,7 +16,7 @@ from docutils import nodes
 from docutils.utils import split_escaped_whitespace, escape2null, unescape
 from docutils.parsers.rst.languages import en as _fallback_language_module
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unichr = chr  # noqa
 
 
diff --git a/docutils/parsers/rst/directives/misc.py b/docutils/parsers/rst/directives/misc.py
index 8cf47757e..01bc8f92c 100644
--- a/docutils/parsers/rst/directives/misc.py
+++ b/docutils/parsers/rst/directives/misc.py
@@ -473,7 +473,7 @@ class Date(Directive):
                 'Invalid context: the "%s" directive can only be used within '
                 'a substitution definition.' % self.name)
         format_str = '\n'.join(self.content) or '%Y-%m-%d'
-        if sys.version_info< (3, 0):
+        if sys.version_info< (3,0):
             try:
                 format_str = format_str.encode(locale_encoding or 'utf-8')
             except UnicodeEncodeError:
@@ -496,7 +496,7 @@ class Date(Directive):
         #                          time.gmtime(int(source_date_epoch)))
         # else:
         text = time.strftime(format_str)
-        if sys.version_info< (3, 0):
+        if sys.version_info< (3,0):
             # `text` is a byte string that may contain non-ASCII characters:
             try:
                 text = text.decode(locale_encoding or 'utf-8')
diff --git a/docutils/parsers/rst/directives/tables.py b/docutils/parsers/rst/directives/tables.py
index 670b1ffc3..ea4c25719 100644
--- a/docutils/parsers/rst/directives/tables.py
+++ b/docutils/parsers/rst/directives/tables.py
@@ -263,7 +263,7 @@ class CSVTable(Table):
             return [detail.args[0]]
         except csv.Error as detail:
             message = str(detail)
-            if sys.version_info < (3,) and '1-character string' in message:
+            if sys.version_info < (3,0) and '1-character string' in message:
                 message += '\nwith Python 2.x this must be an ASCII character.'
             error = self.state_machine.reporter.error(
                 'Error with CSV data in "%s" directive:\n%s'
@@ -356,7 +356,7 @@ class CSVTable(Table):
             raise SystemMessagePropagation(error)
         return csv_data, source
 
-    if sys.version_info < (3,):
+    if sys.version_info < (3,0):
         # 2.x csv module doesn't do Unicode
         def decode_from_csv(s):
             return s.decode('utf-8')
diff --git a/docutils/statemachine.py b/docutils/statemachine.py
index 45280a69d..ce42e03c6 100644
--- a/docutils/statemachine.py
+++ b/docutils/statemachine.py
@@ -113,7 +113,7 @@ import unicodedata
 from docutils import utils
 from docutils.utils.error_reporting import ErrorOutput
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/transforms/frontmatter.py b/docutils/transforms/frontmatter.py
index 3ef5dab55..1a478f2a7 100644
--- a/docutils/transforms/frontmatter.py
+++ b/docutils/transforms/frontmatter.py
@@ -28,7 +28,7 @@ from docutils import nodes, utils
 from docutils.transforms import TransformError, Transform
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/transforms/universal.py b/docutils/transforms/universal.py
index 8e71842b1..972b60358 100644
--- a/docutils/transforms/universal.py
+++ b/docutils/transforms/universal.py
@@ -24,7 +24,7 @@ from docutils.transforms import TransformError, Transform
 from docutils.utils import smartquotes
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/utils/__init__.py b/docutils/utils/__init__.py
index e61b94878..18e45f11a 100644
--- a/docutils/utils/__init__.py
+++ b/docutils/utils/__init__.py
@@ -22,7 +22,7 @@ from docutils.nodes import unescape
 import docutils.io
 from docutils.utils.error_reporting import ErrorOutput, SafeString
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str
 
 
diff --git a/docutils/utils/error_reporting.py b/docutils/utils/error_reporting.py
index c7511e371..c48325d98 100644
--- a/docutils/utils/error_reporting.py
+++ b/docutils/utils/error_reporting.py
@@ -65,7 +65,7 @@ else:
         locale_encoding = None
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/writers/_html_base.py b/docutils/writers/_html_base.py
index 461f2ec85..e45dd37d2 100644
--- a/docutils/writers/_html_base.py
+++ b/docutils/writers/_html_base.py
@@ -40,7 +40,7 @@ from docutils.utils.math import (unichar2tex, pick_math_environment,
                                  math2html, latex2mathml, tex2mathml_extern)
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/writers/docutils_xml.py b/docutils/writers/docutils_xml.py
index 194f21c62..3b024a9e4 100644
--- a/docutils/writers/docutils_xml.py
+++ b/docutils/writers/docutils_xml.py
@@ -17,7 +17,7 @@ from StringIO import StringIO
 import docutils
 from docutils import frontend, writers, nodes
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
@@ -172,7 +172,7 @@ class XMLTranslator(nodes.GenericNodeVisitor):
         self.output.append(xml_string)
         self.default_departure(node)  # or not?
         # Check validity of raw XML:
-        if isinstance(xml_string, unicode) and sys.version_info < (3,):
+        if isinstance(xml_string, unicode) and sys.version_info < (3,0):
             xml_string = xml_string.encode('utf8')
         try:
             self.xmlparser.parse(StringIO(xml_string))
diff --git a/docutils/writers/latex2e/__init__.py b/docutils/writers/latex2e/__init__.py
index e3971729c..e5064f394 100644
--- a/docutils/writers/latex2e/__init__.py
+++ b/docutils/writers/latex2e/__init__.py
@@ -28,7 +28,7 @@ from docutils.transforms import writer_aux
 from docutils.utils.math import pick_math_environment, unichar2tex
 
 
-if sys.version_info >= (3, 0):
+if sys.version_info >= (3,0):
     unicode = str  # noqa
 
 
diff --git a/docutils/writers/manpage.py b/docutils/writers/manpage.py
index e4cba7444..786a0af40 100644
--- a/docutils/writers/manpage.py
+++ b/docutils/writers/manpage.py
@@ -47,7 +47,7 @@ __docformat__ = 'reStructuredText'
 import re
 import sys
 
-if sys.version_info < (3, 0):
+if sys.version_info < (3,0):
     range = xrange
 
 import docutils
diff --git a/docutils/writers/odf_odt/__init__.py b/docutils/writers/odf_odt/__init__.py
index 5a6db88be..e623bc6b5 100644
--- a/docutils/writers/odf_odt/__init__.py
+++ b/docutils/writers/odf_odt/__init__.py
@@ -33,7 +33,7 @@ import docutils
 from docutils import frontend, nodes, utils, writers, languages
 from docutils.readers import standalone
 from docutils.transforms import references
-if sys.version_info.major >= 3:
+if sys.version_info >= (3,0):
     from io import StringIO
     from urllib.request import urlopen
     from urllib.error import HTTPError
@@ -302,7 +302,7 @@ def add_ns(tag, nsdict=CNSD):
 
 def ToString(et):
     outstream = StringIO()
-    if sys.version_info >= (3, 0):
+    if sys.version_info >= (3,0):
         et.write(outstream, encoding="unicode")
     else:
         et.write(outstream)
@@ -902,7 +902,7 @@ class ODFTranslator(nodes.GenericNodeVisitor):
                     self.document.reporter.warning(
                         'Style "%s" is not a style used by odtwriter.' % (
                             rststyle, ))
-                if sys.version_info.major >= 3:
+                if sys.version_info >= (3,0):
                     self.format_map[rststyle] = format
                 else:
                     self.format_map[rststyle] = format.decode('utf-8')