opendev/system-config
Code Issues Proposed changes

Make subunit2html.py py3k and python2 compatible.

Browse Source 
* .../subunit2html.py: Open the html file for writing in binary mode so
that we can specify utf8 as the encoding. Stop trying to decode strings
that have already been preprocessed by the subunit parser. Treat them as
strings and encode to bytestring when writing to the output file.

Change-Id: I81f13794ad7b40dfbc8ad44d2a9a5acd855c0029
This commit is contained in:
Clark Boylan 2013-08-07 14:46:36 -07:00
parent 6fa7f76cbd
commit cddb8715c1
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/jenkins/files/slave_scripts/subunit2html.py
View File

@ -510,8 +510,8 @@ class HtmlOutput(testtools.TestResult):
ending=ending,
)
if self.html_file:
html_file = open(self.html_file, 'w')
html_file.write(output.encode('utf8'))
with open(self.html_file, 'wb') as html_file:
html_file.write(output.encode('utf8'))
def _getReportAttributes(self):
"""Return report attributes as a list of (name, value)."""
@ -646,28 +646,9 @@ class HtmlOutput(testtools.TestResult):
tmpl = (has_output and TemplateData.REPORT_TEST_WITH_OUTPUT_TMPL
or TemplateData.REPORT_TEST_NO_OUTPUT_TMPL)
# Comments below from the original source project.
# TODO: clean this up within the context of a nose plugin.
# o and e should be byte string because they are collected
# from stdout and stderr?
if isinstance(o, str):
# TODO: some problem with 'string_escape': it escape \n
# and mess up formating
# uo = unicode(o.encode('string_escape'))
uo = o.decode('latin-1')
else:
uo = o
if isinstance(e, str):
# TODO: some problem with 'string_escape':
# it escape \n and mess up formating
# ue = unicode(e.encode('string_escape'))
ue = e.decode('latin-1')
else:
ue = e
script = TemplateData.REPORT_TEST_OUTPUT_TMPL % dict(
id=tid,
output=saxutils.escape(uo + ue),
output=saxutils.escape(o + e),
)
row = tmpl % dict(