diff -r 2a70d5240300 -r 21164625b393 CodeFileTreeNode.py --- a/CodeFileTreeNode.py Fri Nov 23 11:01:20 2018 +0100 +++ b/CodeFileTreeNode.py Fri Nov 23 12:13:24 2018 +0100 @@ -27,8 +27,9 @@ import os import re import traceback - +from builtins import str as text from copy import deepcopy + from lxml import etree from xmlclass import GenerateParserFromXSDstring @@ -113,8 +114,8 @@ '<%s>' % self.CODEFILE_NAME, '<%s xmlns:xhtml="http://www.w3.org/1999/xhtml">' % self.CODEFILE_NAME) for cre, repl in [ - (re.compile("(?)(?:)(?!)"), "]]>")]: + (re.compile(r"(?)(?:)(?!)"), "]]>")]: codefile_xml = cre.sub(repl, codefile_xml) try: @@ -124,7 +125,7 @@ self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) self.CreateCodeFileBuffer(True) except Exception as exc: - msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=self.CTNName(), a2=unicode(exc)) + msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=self.CTNName(), a2=text(exc)) self.GetCTRoot().logger.write_error(msg) self.GetCTRoot().logger.write_error(traceback.format_exc()) raise Exception