--- a/ConfigTreeNode.py Fri Oct 28 13:06:52 2022 +0800
+++ b/ConfigTreeNode.py Fri Oct 28 14:07:13 2022 +0800
@@ -38,8 +38,6 @@
import shutil
from operator import add
from functools import reduce
-from builtins import str as text
-from past.builtins import execfile
from lxml import etree
@@ -294,7 +292,7 @@
LDFLAGS = []
if CTNLDFLAGS is not None:
# LDFLAGS can be either string
- if isinstance(CTNLDFLAGS, (str, text)):
+ if isinstance(CTNLDFLAGS, str):
LDFLAGS += [CTNLDFLAGS]
# or list of strings
elif isinstance(CTNLDFLAGS, list):
@@ -647,7 +645,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=text(exc))
+ msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=str(exc))
self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
@@ -664,7 +662,7 @@
self.CTNParams = (name, obj)
xmlfile.close()
except Exception as exc:
- msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=text(exc))
+ msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=str(exc))
self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())
@@ -677,7 +675,7 @@
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=text(exc))
+ msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=str(exc))
self.GetCTRoot().logger.write_error(msg)
self.GetCTRoot().logger.write_error(traceback.format_exc())