pool/python-docutils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 737542 from home:mcepl:branches:devel:languages:python

Browse Source 
- Add fix_tests_38.patch to overcome failing
  test_writers.test_odt.DocutilsOdtTestCase with Python 3.8.
  Also, failed as shp#docutils#161.

OBS-URL: https://build.opensuse.org/request/show/737542
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=59
This commit is contained in:
Matej Cepl 2019-10-11 15:22:37 +00:00 committed by Git OBS Bridge
parent 076ec723b0
commit 130ce8ede8
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fix_tests_38.patch
View File

@ -1,12 +1,40 @@
--- a/test/test_writers/test_odt.py
+++ b/test/test_writers/test_odt.py
@@ -114,7 +114,8 @@ class DocutilsOdtTestCase(DocutilsTestSu
@@ -80,7 +80,7 @@ class DocutilsOdtTestCase(DocutilsTestSu
sys.stderr.write(s1)
return WhichElementTree
- def process_test(self, input_filename, expected_filename,
+ def process_test(self, input_filename, expected_filename,
save_output_name=None, settings_overrides=None):
if not self.check_import():
return
@@ -112,19 +112,22 @@ class DocutilsOdtTestCase(DocutilsTestSu
outfile.close()
content1 = self.extract_file(result, 'content.xml')
content2 = self.extract_file(expected, 'content.xml')
msg = 'content.xml not equal: expected len: %d actual len: %d' % (
len(content2), len(content1), )
- msg = 'content.xml not equal: expected len: %d actual len: %d' % (
- len(content2), len(content1), )
- self.assertEqual(content1, content2, msg)
+ # self.assertEqual(content1, content2, msg)
+ self.assertEqual(content1, content2)
def extract_file(self, payload, filename):
+ from xml.etree import ElementTree as etree
payloadfile = BytesIO()
payloadfile.write(payload)
payloadfile.seek(0)
zfile = zipfile.ZipFile(payloadfile, 'r')
content1 = zfile.read(filename)
- doc = minidom.parseString(content1)
- #content2 = doc.toprettyxml(indent=' ')
- content2 = doc.toxml()
+ if hasattr(etree, 'canonicalize'):
+ content2 = etree.canonicalize(content1, with_comments=True)
+ else:
+ #content2 = doc.toprettyxml(indent=' ')
+ doc = minidom.parseString(content1)
+ content2 = doc.toxml()
return content2
def assertEqual(self, first, second, msg=None):

5
python-docutils.changes
View File

@ -1,8 +1,9 @@
-------------------------------------------------------------------
Fri Oct 11 14:11:49 CEST 2019 - Matej Cepl <mcepl@suse.com>
- Add fix_tests_38.patch to overcome failing tests with Python
3.8.
- Add fix_tests_38.patch to overcome failing
test_writers.test_odt.DocutilsOdtTestCase with Python 3.8.
Also, failed as shp#docutils#161.
-------------------------------------------------------------------
Sat Sep 14 01:50:36 UTC 2019 - John Vandenberg <jayvdb@gmail.com>

2
python-docutils.spec
View File

@ -34,6 +34,8 @@ Group: Development/Languages/Python
URL: https://pypi.python.org/pypi/docutils/
Source: https://files.pythonhosted.org/packages/source/d/docutils/docutils-%{version}.tar.gz
Source99: python-docutils-rpmlintrc
# PATCH-FIX-UPSTREAM fix_tests_38.patch shp#docutils#161 mcepl@suse.com
# Fixes failing tests in test_writers.test_odt.DocutilsOdtTestCase
Patch0: fix_tests_38.patch
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module xml}