Menu
▾
▴
[Docutils-develop] [PATCH 21/39] py3: Consistent Python 3 checks
|
From: Stephen F. <st...@th...> - 2019-08-25 15:57:37
|
Signed-off-by: Stephen Finucane <st...@th...ru>
---
docutils/docutils/_compat.py | 2 +-
docutils/docutils/core.py | 2 +-
docutils/docutils/io.py | 14 +++++++-------
docutils/docutils/utils/__init__.py | 8 ++++----
docutils/docutils/utils/error_reporting.py | 2 +-
docutils/docutils/utils/math/math2html.py | 6 +++---
docutils/test/DocutilsTestSupport.py | 2 +-
docutils/test/test_command_line.py | 2 +-
docutils/test/test_functional.py | 8 ++++----
docutils/test/test_io.py | 8 ++++----
.../test_rst/test_directives/test_include.py | 2 +-
.../test_rst/test_directives/test_raw.py | 2 +-
.../test_rst/test_directives/test_tables.py | 2 +-
docutils/tools/dev/unicode2rstsubs.py | 2 +-
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/docutils/docutils/_compat.py b/docutils/docutils/_compat.py
index 017adcee7..2bcfd75ca 100644
--- a/docutils/docutils/_compat.py
+++ b/docutils/docutils/_compat.py
@@ -14,7 +14,7 @@ This module currently provides the following helper symbols:
import sys
-if sys.version_info < (3,0):
+if sys.version_info < (3, 0):
u_prefix = 'u'
from StringIO import StringIO as BytesIO
else:
diff --git a/docutils/docutils/core.py b/docutils/docutils/core.py
index 8bc3e2b34..0fe19bbe4 100644
--- a/docutils/docutils/core.py
+++ b/docutils/docutils/core.py
@@ -155,7 +155,7 @@ class Publisher(object):
if argv is None:
argv = sys.argv[1:]
# converting to Unicode (Python 3 does this automatically):
- if sys.version_info < (3,0):
+ if sys.version_info < (3, 0):
# TODO: make this failsafe and reversible?
argv_encoding = (frontend.locale_encoding or 'ascii')
argv = [a.decode(argv_encoding) for a in argv]
diff --git a/docutils/docutils/io.py b/docutils/docutils/io.py
index fffc5b359..b697a0398 100644
--- a/docutils/docutils/io.py
+++ b/docutils/docutils/io.py
@@ -239,7 +239,7 @@ class FileInput(Input):
if source is None:
if source_path:
# Specify encoding in Python 3
- if sys.version_info >= (3,0):
+ if sys.version_info >= (3, 0):
kwargs = {'encoding': self.encoding,
'errors': self.error_handler}
else:
@@ -251,7 +251,7 @@ class FileInput(Input):
raise InputError(error.errno, error.strerror, source_path)
else:
self.source = sys.stdin
- elif (sys.version_info >= (3,0) and
+ elif (sys.version_info >= (3, 0) and
check_encoding(self.source, self.encoding) is False):
# TODO: re-open, warn or raise error?
raise UnicodeError('Encoding clash: encoding given is "%s" '
@@ -268,7 +268,7 @@ class FileInput(Input):
Read and decode a single file and return the data (Unicode string).
"""
try:
- if self.source is sys.stdin and sys.version_info >= (3,0):
+ if self.source is sys.stdin and sys.version_info >= (3, 0):
# read as binary data to circumvent auto-decoding
data = self.source.buffer.read()
# normalize newlines
@@ -358,7 +358,7 @@ class FileOutput(Output):
def open(self):
# Specify encoding in Python 3.
- if sys.version_info >= (3,0) and 'b' not in self.mode:
+ if sys.version_info >= (3, 0) and 'b' not in self.mode:
kwargs = {'encoding': self.encoding,
'errors': self.error_handler}
else:
@@ -378,17 +378,17 @@ class FileOutput(Output):
"""
if not self.opened:
self.open()
- if ('b' not in self.mode and sys.version_info < (3,0)
+ if ('b' not in self.mode and sys.version_info < (3, 0)
or check_encoding(self.destination, self.encoding) is False
):
data = self.encode(data)
- if sys.version_info >= (3,0) and os.linesep != '\n':
+ if sys.version_info >= (3, 0) and os.linesep != '\n':
data = data.replace(b'\n', bytes(os.linesep, 'ascii')) # fix endings
try:
self.destination.write(data)
except TypeError as e:
- if sys.version_info >= (3,0) and isinstance(data, bytes):
+ if sys.version_info >= (3, 0) and isinstance(data, bytes):
try:
self.destination.buffer.write(data)
except AttributeError:
diff --git a/docutils/docutils/utils/__init__.py b/docutils/docutils/utils/__init__.py
index e61b94878..af17f7e29 100644
--- a/docutils/docutils/utils/__init__.py
+++ b/docutils/docutils/utils/__init__.py
@@ -592,7 +592,7 @@ def split_escaped_whitespace(text):
return list(itertools.chain(*strings))
def strip_combining_chars(text):
- if isinstance(text, str) and sys.version_info < (3,0):
+ if isinstance(text, str) and sys.version_info < (3, 0):
return text
return u''.join([c for c in text if not unicodedata.combining(c)])
@@ -604,9 +604,9 @@ def find_combining_chars(text):
[3, 6, 9]
"""
- if isinstance(text, str) and sys.version_info < (3,0):
+ if isinstance(text, str) and sys.version_info < (3, 0):
return []
- return [i for i,c in enumerate(text) if unicodedata.combining(c)]
+ return [i for i, c in enumerate(text) if unicodedata.combining(c)]
def column_indices(text):
"""Indices of Unicode string `text` when skipping combining characters.
@@ -638,7 +638,7 @@ def column_width(text):
Correct ``len(text)`` for wide East Asian and combining Unicode chars.
"""
- if isinstance(text, str) and sys.version_info < (3,0):
+ if isinstance(text, str) and sys.version_info < (3, 0):
return len(text)
width = sum([east_asian_widths[unicodedata.east_asian_width(c)]
for c in text])
diff --git a/docutils/docutils/utils/error_reporting.py b/docutils/docutils/utils/error_reporting.py
index c7511e371..ec98837ee 100644
--- a/docutils/docutils/utils/error_reporting.py
+++ b/docutils/docutils/utils/error_reporting.py
@@ -93,7 +93,7 @@ class SafeString(object):
for arg in self.data.args]
return ', '.join(args)
if isinstance(self.data, unicode):
- if sys.version_info > (3,0):
+ if sys.version_info > (3, 0):
return self.data
else:
return self.data.encode(self.encoding,
diff --git a/docutils/docutils/utils/math/math2html.py b/docutils/docutils/utils/math/math2html.py
index adcb1cc68..c65de9169 100644
--- a/docutils/docutils/utils/math/math2html.py
+++ b/docutils/docutils/utils/math/math2html.py
@@ -30,7 +30,7 @@ import unicodedata
import urllib
-if sys.version_info >= (3,0):
+if sys.version_info >= (3, 0):
unicode = str #noqa
basestring = str # noqa
file = io.IOBase # noqa
@@ -73,7 +73,7 @@ class Trace(object):
def show(cls, message, channel):
"Show a message out of a channel"
- if sys.version_info < (3,0):
+ if sys.version_info < (3, 0):
message = message.encode('utf-8')
channel.write(message + '\n')
@@ -1785,7 +1785,7 @@ class LineWriter(object):
"Write a string"
if not self.file:
self.file = codecs.open(self.filename, 'w', "utf-8")
- if self.file == sys.stdout and sys.version_info < (3,0):
+ if self.file == sys.stdout and sys.version_info < (3, 0):
string = string.encode('utf-8')
self.file.write(string)
diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 8b62ca5aa..de6c620c9 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, '..',
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_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_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
index 9b7326d5a..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
@@ -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 ed22edc49..3fe7b00fc 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
@@ -43,7 +43,7 @@ else:
# some error messages changed in Python 3.3, CPython has backported to 2.7.4,
# PyPy has not
csv_eod_error_str = 'unexpected end of data'
-if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
+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':
diff --git a/docutils/tools/dev/unicode2rstsubs.py b/docutils/tools/dev/unicode2rstsubs.py
index 6dd2ac87c..24b259bda 100755
--- a/docutils/tools/dev/unicode2rstsubs.py
+++ b/docutils/tools/dev/unicode2rstsubs.py
@@ -48,7 +48,7 @@ def main(argv=None):
inpath = 'unicode.xml'
if not os.path.isfile(inpath):
usage(argv[0], 1, 'No such file: "%s".' % inpath)
- if sys.version_info >= (3,0):
+ if sys.version_info >= (3, 0):
infile = open(inpath, mode='rb')
else:
infile = open(inpath)
--
2.21.0
|
