boost_mirror/boostbook
1
0
Fork 0
mirror of https://github.com/boostorg/boostbook.git synced 2025-05-09 15:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated run-tests.py for compatibility with Python 3.x.

Browse Source
This commit is contained in:
Andrey Semashev 2024-05-15 01:35:06 +03:00
parent fe6f1a818f
commit 2c95662e24
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/more/run-tests.py
View File

@ -17,7 +17,7 @@ from collections import defaultdict
# Globals # Globals
def usage_and_exit(): def usage_and_exit():
print __doc__ print(__doc__)
sys.exit(2) sys.exit(2)
def main(argv): def main(argv):
@ -45,9 +45,9 @@ def main(argv):
boostbook_xsl = etree.XSLT( boostbook_xsl = etree.XSLT(
etree.parse(os.path.join(boostbook_directory, "docbook.xsl"), parser) etree.parse(os.path.join(boostbook_directory, "docbook.xsl"), parser)
) )
except lxml.etree.XMLSyntaxError, error: except (lxml.etree.XMLSyntaxError, error):
print "Error parsing boostbook xsl:" print("Error parsing boostbook xsl:")
print error print(error)
sys.exit(1) sys.exit(1)
for root, dirs, files in os.walk(os.path.join(script_directory, 'tests')): for root, dirs, files in os.walk(os.path.join(script_directory, 'tests')):
@ -69,7 +69,7 @@ def main(argv):
doc_text = run_boostbook(parser, boostbook_xsl, src_path) doc_text = run_boostbook(parser, boostbook_xsl, src_path)
except: except:
# TODO: Need better error reporting here: # TODO: Need better error reporting here:
print "Error running boostbook for " + src_path print("Error running boostbook for " + src_path)
success = False success = False
continue continue
@ -93,13 +93,13 @@ def main(argv):
def run_boostbook(parser, boostbook_xsl, file): def run_boostbook(parser, boostbook_xsl, file):
doc = boostbook_xsl(etree.parse(file, parser)) doc = boostbook_xsl(etree.parse(file, parser))
normalize_boostbook_ids(doc) normalize_boostbook_ids(doc)
return etree.tostring(doc) return etree.tostring(doc).decode("utf-8")
def run_boostbook_consistent_ids(parser, boostbook_xsl, file): def run_boostbook_consistent_ids(parser, boostbook_xsl, file):
doc = boostbook_xsl(etree.parse(file, parser), **{ doc = boostbook_xsl(etree.parse(file, parser), **{
'generate.consistent.ids': '1' 'generate.consistent.ids': '1'
}) })
return etree.tostring(doc) return etree.tostring(doc).decode("utf-8")
def normalize_boostbook_ids(doc): def normalize_boostbook_ids(doc):
ids = {} ids = {}
@ -109,7 +109,7 @@ def normalize_boostbook_ids(doc):
id = node.get('id') id = node.get('id')
if(id in ids): if(id in ids):
print 'Duplicate id: ' + id print('Duplicate id: ' + id)
match = re.match("(.+_id|id)([-mp]?[\d_]+)((?:-bb)?)", id) match = re.match("(.+_id|id)([-mp]?[\d_]+)((?:-bb)?)", id)
if(match): if(match):
@ -131,7 +131,7 @@ def compare_xml(file, doc_text, gold_text):
# So instead just do a text diff. # So instead just do a text diff.
if (doc_text != gold_text): if (doc_text != gold_text):
print "Error: " + file print("Error: " + file)
print print
sys.stdout.writelines( sys.stdout.writelines(
difflib.unified_diff( difflib.unified_diff(