diff -r 2e8bf28a8909 -r 07f48018b6f5 ConfigTreeNode.py --- a/ConfigTreeNode.py Thu Oct 04 12:09:23 2018 +0300 +++ b/ConfigTreeNode.py Thu Oct 04 17:24:40 2018 +0300 @@ -36,10 +36,11 @@ import traceback import types import shutil +from builtins import str as text + from lxml import etree from xmlclass import GenerateParserFromXSDstring - from PLCControler import LOCATION_CONFNODE from editors.ConfTreeNodeEditor import ConfTreeNodeEditor @@ -277,7 +278,7 @@ LDFLAGS = [] if CTNLDFLAGS is not None: # LDFLAGS can be either string - if isinstance(CTNLDFLAGS, (str, unicode)): + if isinstance(CTNLDFLAGS, (str, text)): LDFLAGS += [CTNLDFLAGS] # or list of strings elif isinstance(CTNLDFLAGS, list): @@ -627,7 +628,7 @@ self.MandatoryParams = ("BaseParams", self.BaseParams) basexmlfile.close() except Exception as exc: - msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) + msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=text(exc)) self.GetCTRoot().logger.write_error(msg) self.GetCTRoot().logger.write_error(traceback.format_exc()) @@ -644,7 +645,7 @@ self.CTNParams = (name, obj) xmlfile.close() except Exception as exc: - msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) + msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=text(exc)) self.GetCTRoot().logger.write_error(msg) self.GetCTRoot().logger.write_error(traceback.format_exc()) @@ -657,6 +658,6 @@ try: self.CTNAddChild(pname, ptype) except Exception as exc: - msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=unicode(exc)) + msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=text(exc)) self.GetCTRoot().logger.write_error(msg) self.GetCTRoot().logger.write_error(traceback.format_exc())