diff options
28 files changed, 55 insertions, 55 deletions
diff --git a/docutils/docutils/frontend.py b/docutils/docutils/frontend.py index 692dc8fcc..f0f586299 100644 --- a/docutils/docutils/frontend.py +++ b/docutils/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/docutils/io.py b/docutils/docutils/io.py index fffc5b359..b886840fa 100644 --- a/docutils/docutils/io.py +++ b/docutils/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/docutils/nodes.py b/docutils/docutils/nodes.py index 2615e3cfe..74a7c62ef 100644 --- a/docutils/docutils/nodes.py +++ b/docutils/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/docutils/parsers/rst/directives/__init__.py b/docutils/docutils/parsers/rst/directives/__init__.py index 6b6e022f7..1399dab9c 100644 --- a/docutils/docutils/parsers/rst/directives/__init__.py +++ b/docutils/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/docutils/parsers/rst/directives/misc.py b/docutils/docutils/parsers/rst/directives/misc.py index 8cf47757e..01bc8f92c 100644 --- a/docutils/docutils/parsers/rst/directives/misc.py +++ b/docutils/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/docutils/parsers/rst/directives/tables.py b/docutils/docutils/parsers/rst/directives/tables.py index 670b1ffc3..ea4c25719 100644 --- a/docutils/docutils/parsers/rst/directives/tables.py +++ b/docutils/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/docutils/statemachine.py b/docutils/docutils/statemachine.py index 45280a69d..ce42e03c6 100644 --- a/docutils/docutils/statemachine.py +++ b/docutils/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/docutils/transforms/frontmatter.py b/docutils/docutils/transforms/frontmatter.py index 3ef5dab55..1a478f2a7 100644 --- a/docutils/docutils/transforms/frontmatter.py +++ b/docutils/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/docutils/transforms/universal.py b/docutils/docutils/transforms/universal.py index 8e71842b1..972b60358 100644 --- a/docutils/docutils/transforms/universal.py +++ b/docutils/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/docutils/utils/__init__.py b/docutils/docutils/utils/__init__.py index e61b94878..18e45f11a 100644 --- a/docutils/docutils/utils/__init__.py +++ b/docutils/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/docutils/utils/error_reporting.py b/docutils/docutils/utils/error_reporting.py index c7511e371..c48325d98 100644 --- a/docutils/docutils/utils/error_reporting.py +++ b/docutils/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/docutils/writers/_html_base.py b/docutils/docutils/writers/_html_base.py index 461f2ec85..e45dd37d2 100644 --- a/docutils/docutils/writers/_html_base.py +++ b/docutils/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/docutils/writers/docutils_xml.py b/docutils/docutils/writers/docutils_xml.py index 194f21c62..3b024a9e4 100644 --- a/docutils/docutils/writers/docutils_xml.py +++ b/docutils/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/docutils/writers/latex2e/__init__.py b/docutils/docutils/writers/latex2e/__init__.py index e3971729c..e5064f394 100644 --- a/docutils/docutils/writers/latex2e/__init__.py +++ b/docutils/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/docutils/writers/manpage.py b/docutils/docutils/writers/manpage.py index e4cba7444..786a0af40 100644 --- a/docutils/docutils/writers/manpage.py +++ b/docutils/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/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py index 5a6db88be..e623bc6b5 100644 --- a/docutils/docutils/writers/odf_odt/__init__.py +++ b/docutils/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') diff --git a/docutils/setup.py b/docutils/setup.py index 77e151f6a..4150d72bb 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -13,7 +13,7 @@ try: from distutils.core import setup, Command from distutils.command.build import build from distutils.command.build_py import build_py - if sys.version_info >= (3,): + if sys.version_info >= (3,0): from distutils.command.build_py import build_py_2to3 from distutils.util import copydir_run_2to3 from distutils.command.install_data import install_data @@ -27,7 +27,7 @@ except ImportError: sys.exit(1) -if sys.version_info >= (3,): +if sys.version_info >= (3,0): # copy-convert auxiliary python sources class copy_build_py_2to3(build_py_2to3): """Copy/convert Python source files in given directories recursively. @@ -97,7 +97,7 @@ def do_setup(): kwargs['cmdclass'] = {'build_data': build_data, 'install_data': smart_install_data} # Auto-convert source code for Python 3 - if sys.version_info >= (3,): + if sys.version_info >= (3,0): kwargs['cmdclass']['build_py'] = copy_build_py_2to3 else: kwargs['cmdclass']['build_py'] = build_py 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 diff --git a/docutils/tools/dev/create_unimap.py b/docutils/tools/dev/create_unimap.py index e08dbea9c..01d03498c 100755 --- a/docutils/tools/dev/create_unimap.py +++ b/docutils/tools/dev/create_unimap.py @@ -14,7 +14,7 @@ from xml.dom import minidom import sys import pprint -if sys.version_info >= (3, 0): +if sys.version_info >= (3,0): unicode = str #noqa else: bytes = str # noqa @@ -22,7 +22,7 @@ else: def w(s): - if sys.version_info >= (3, 0) and isinstance(s, unicode): + if sys.version_info >= (3,0) and isinstance(s, unicode): s = s.encode('utf8') sys.stdout.write(s) diff --git a/docutils/tools/dev/generate_punctuation_chars.py b/docutils/tools/dev/generate_punctuation_chars.py index 743054e80..be3dacb6f 100644 --- a/docutils/tools/dev/generate_punctuation_chars.py +++ b/docutils/tools/dev/generate_punctuation_chars.py @@ -38,7 +38,7 @@ from __future__ import print_function import sys import unicodedata -if sys.version_info >= (3,): +if sys.version_info >= (3,0): unichr = chr # unichr not available in Py3k else: import codecs @@ -361,7 +361,7 @@ if __name__ == '__main__': # Import the punctuation_chars module from the source # or Py3k build path for local Python modules:: - if sys.version_info < (3,): + if sys.version_info < (3,0): sys.path.insert(0, '../../docutils') else: sys.path.insert(0, '../../build/lib') |