rpms/python-docutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Skip null-bytes exception tests on Python 3.11

Browse Source 
Since Python 3.11.0a2, it is possible to load null bytes by the csv module.

Upstream report: https://sourceforge.net/p/docutils/bugs/436/
This commit is contained in:
Miro Hrončok 2021-11-26 14:13:19 +01:00
parent 0199cfc028
commit c89db544dd
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-docutils.spec
View File

@ -8,6 +8,9 @@ License: Public Domain and BSD and Python and GPLv3+
URL: https://docutils.sourceforge.net
Source0: https://sourceforge.net/projects/docutils/files/docutils/%{version}/docutils-%{version}.tar.gz
# https://sourceforge.net/p/docutils/bugs/436/
Patch1: python3.11-skip-null-bytes-exception-test.patch
BuildArch: noarch
BuildRequires: pyproject-rpm-macros
@ -34,7 +37,7 @@ Summary: %{summary}
%prep
%autosetup -n docutils-%{version}
%autosetup -p1 -n docutils-%{version}
# Remove shebang from library files
sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $(grep -Erl '^#!.+python' docutils)

88
python3.11-skip-null-bytes-exception-test.patch Normal file
View File

@ -0,0 +1,88 @@
diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
index 2e11131..cf9f097 100755
--- a/test/test_parsers/test_rst/test_directives/test_tables.py
+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
@@ -55,17 +55,6 @@ csv_unknown_url = "'bogus.csv'"
if sys.version_info < (3, 0):
csv_unknown_url = "bogus.csv"
-
-def null_bytes():
- with open(utf_16_csv, 'rb') as f:
- csv_data = f.read()
- csv_data = unicode(csv_data, 'latin1').splitlines()
- reader = csv.reader([tables.CSVTable.encode_for_csv(line + '\n')
- for line in csv_data])
- next(reader)
-
-null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
-
totest = {}
totest['table'] = [
@@ -1025,26 +1014,6 @@ u"""\
good, csv, data
""" % csv_eod_error_str],
["""\
-.. csv-table:: bad encoding
- :file: %s
- :encoding: latin-1
-
-(7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
-""" % utf_16_csv,
-"""\
-<document source="test data">
- <system_message level="3" line="1" source="test data" type="ERROR">
- <paragraph>
- Error with CSV data in "csv-table" directive:
- %s
- <literal_block xml:space="preserve">
- .. csv-table:: bad encoding
- :file: %s
- :encoding: latin-1
- <paragraph>
- (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
-""" % (null_bytes_exception, utf_16_csv)],
-["""\
.. csv-table:: good encoding
:file: %s
:encoding: utf-16
@@ -1459,6 +1428,38 @@ totest['list-table'] = [
"""],
]
+if sys.version_info < (3, 11):
+ def null_bytes():
+ with open(utf_16_csv, 'rb') as f:
+ csv_data = f.read()
+ csv_data = unicode(csv_data, 'latin1').splitlines()
+ reader = csv.reader([tables.CSVTable.encode_for_csv(line + '\n')
+ for line in csv_data])
+ next(reader)
+
+ null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
+
+ totest['table'].append(["""\
+.. csv-table:: bad encoding
+ :file: %s
+ :encoding: latin-1
+
+(7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+""" % utf_16_csv,
+"""\
+<document source="test data">
+ <system_message level="3" line="1" source="test data" type="ERROR">
+ <paragraph>
+ Error with CSV data in "csv-table" directive:
+ %s
+ <literal_block xml:space="preserve">
+ .. csv-table:: bad encoding
+ :file: %s
+ :encoding: latin-1
+ <paragraph>
+ (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+""" % (null_bytes_exception, utf_16_csv)])
+
if __name__ == '__main__':
import unittest