Formatting changes to facilitate integration of "py3" patchset.

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

13 files changed, 34 insertions, 33 deletions

diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index c7112d631..107633f5b 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -51,7 +51,7 @@ from pprint import pformat
 
 testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
 os.chdir(testroot)
-if sys.version_info >= (3,0):
+if sys.version_info >= (3, 0):
     sys.path.insert(0, os.path.normpath(os.path.join(testroot,
                                                      '..', 'build', 'lib')))
     sys.path.append(os.path.normpath(os.path.join(testroot, '..',
@@ -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,0):
+        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 d6a84f03e..c66f97a02 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_command_line.py b/docutils/test/test_command_line.py
index e7e3faa77..fa26b4cf2 100644
--- a/docutils/test/test_command_line.py
+++ b/docutils/test/test_command_line.py
@@ -33,7 +33,7 @@ class CommandLineEncodingTests(unittest.TestCase):
         if argv_encoding == 'ascii': # cannot test
             return
         sys.argv.append('--source-url=test.txt') # pure ASCII argument
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             sys.argv.append(u'--title=Dornröschen'.encode(argv_encoding))
         else:
             sys.argv.append(u'--title=Dornröschen')
diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py
index 6b5073d1d..2159ce291 100644
--- a/docutils/test/test_error_reporting.py
+++ b/docutils/test/test_error_reporting.py
@@ -26,17 +26,18 @@ unless the minimal required Python version has this problem fixed.
 """
 from __future__ import print_function
 
-import unittest
 import os
 import sys
+import unittest
 from io import StringIO, BytesIO
 
 import DocutilsTestSupport              # must be imported before docutils
 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 +45,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_functional.py b/docutils/test/test_functional.py
index 04fb0faeb..f33929ba9 100755
--- a/docutils/test/test_functional.py
+++ b/docutils/test/test_functional.py
@@ -162,7 +162,7 @@ expected output and check it in:
         output = docutils.core.publish_file(**params)
         # ensure output is unicode
         output_encoding = params.get('output_encoding', 'utf-8')
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             try:
                 output = output.decode(output_encoding)
             except UnicodeDecodeError:
@@ -174,14 +174,14 @@ expected output and check it in:
         no_expected = self.no_expected_template % {
             'exp': expected_path, 'out': params['destination_path']}
         self.assertTrue(os.access(expected_path, os.R_OK), no_expected)
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             f = open(expected_path, 'r')
         else: # samples are UTF8 encoded. 'rb' leads to errors with Python 3!
             f = open(expected_path, 'r', encoding='utf-8')
         # Normalize line endings:
         expected = '\n'.join(f.read().splitlines())
         f.close()
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             try:
                 expected = expected.decode(output_encoding)
             except UnicodeDecodeError:
@@ -195,7 +195,7 @@ expected output and check it in:
             diff = ''.join(difflib.unified_diff(
                 expected.splitlines(True), output.splitlines(True),
                 expected_path, params['destination_path']))
-            if sys.version_info < (3,0):
+            if sys.version_info < (3, 0):
                 diff = diff.encode(sys.stderr.encoding or 'ascii', 'replace')
             print('\n%s:' % (self,), file=sys.stderr)
             print(diff, file=sys.stderr)
diff --git a/docutils/test/test_io.py b/docutils/test/test_io.py
index 0c8485fa5..5f7f814e3 100755
--- a/docutils/test/test_io.py
+++ b/docutils/test/test_io.py
@@ -103,7 +103,7 @@ print("hello world")
         # if no encoding is given, try decoding with utf8:
         input = io.FileInput(source_path='functional/input/cyrillic.txt')
         data = input.read()
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             # in Py3k, the locale encoding is used without --input-encoding
             # skipping the heuristic
             self.assertEqual(input.successful_encoding, 'utf-8')
@@ -111,7 +111,7 @@ print("hello world")
     def test_heuristics_no_utf8(self):
         # if no encoding is given and decoding with utf8 fails,
         # use either the locale encoding (if specified) or latin-1:
-        if sys.version_info >= (3,0) and locale_encoding != "utf8":
+        if sys.version_info >= (3, 0) and locale_encoding != "utf8":
             # in Py3k, the locale encoding is used without --input-encoding
             # skipping the heuristic unless decoding fails.
             return
@@ -172,7 +172,7 @@ class OutputTests(unittest.TestCase):
         self.assertEqual(self.udrain.getvalue(), self.udata)
 
     def test_write_utf8(self):
-        if sys.version_info >= (3,0):
+        if sys.version_info >= (3, 0):
             fo = io.FileOutput(destination=self.udrain, encoding='utf8',
                                autoclose=False)
             fo.write(self.udata)
@@ -192,7 +192,7 @@ class OutputTests(unittest.TestCase):
         self.assertEqual(self.bdrain.getvalue(), self.bdata)
 
     # Test for Python 3 features:
-    if sys.version_info >= (3,0):
+    if sys.version_info >= (3, 0):
         def test_write_bytes_to_stdout(self):
             # try writing data to `destination.buffer`, if data is
             # instance of `bytes` and writing to `destination` fails:
diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py
index d97a2eb69..29de60c2a 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 a63fbed57..999fac967 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,0):
+        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,0):
+        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,0):
+        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,0):
+        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,0):
+        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,0): # 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,0): # 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 ef717f833..3cabe6264 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,0):
+        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 10e76efd4..8401732f4 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
 
 
@@ -48,7 +48,7 @@ include_literal = mydir('include_literal.txt')
 utf_16_file = mydir('utf-16.csv')
 utf_16_error_str = ("UnicodeDecodeError: 'ascii' codec can't decode byte 0xfe "
                     "in position 0: ordinal not in range(128)")
-if sys.version_info < (3,0):
+if sys.version_info < (3, 0):
     utf_16_error_str = ("UnicodeError: Unable to decode input data.  "
                         "Tried the following encodings: 'ascii'.\n"
                         "            (%s)" % utf_16_error_str)
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py
index 0d37f621a..06d7b09da 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py
@@ -26,7 +26,7 @@ utf_16_file = os.path.join(mydir, 'utf-16.csv')
 utf_16_file_rel = DocutilsTestSupport.utils.relative_path(None, utf_16_file)
 utf_16_error_str = ("UnicodeDecodeError: 'ascii' codec can't decode byte 0xfe "
                     "in position 0: ordinal not in range(128)")
-if sys.version_info < (3,0):
+if sys.version_info < (3, 0):
     utf_16_error_str = ("UnicodeError: Unable to decode input data.  "
                         "Tried the following encodings: 'ascii'.\n"
                         "            (%s)" % utf_16_error_str)
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 41e0b4359..94befd11d 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 >= (3,0) 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 e2d4676df..3ac5aa394 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