equal
deleted
inserted
replaced
624 if error is not None: |
624 if error is not None: |
625 (fname, lnum, src) = ((ConfNodeName + " BaseParams",) + error) |
625 (fname, lnum, src) = ((ConfNodeName + " BaseParams",) + error) |
626 self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
626 self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
627 self.MandatoryParams = ("BaseParams", self.BaseParams) |
627 self.MandatoryParams = ("BaseParams", self.BaseParams) |
628 basexmlfile.close() |
628 basexmlfile.close() |
629 except Exception, exc: |
629 except Exception as exc: |
630 msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) |
630 msg = _("Couldn't load confnode base parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) |
631 self.GetCTRoot().logger.write_error(msg) |
631 self.GetCTRoot().logger.write_error(msg) |
632 self.GetCTRoot().logger.write_error(traceback.format_exc()) |
632 self.GetCTRoot().logger.write_error(traceback.format_exc()) |
633 |
633 |
634 # Get the xml tree |
634 # Get the xml tree |
641 self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
641 self.GetCTRoot().logger.write_warning(XSDSchemaErrorMessage.format(a1=fname, a2=lnum, a3=src)) |
642 name = obj.getLocalTag() |
642 name = obj.getLocalTag() |
643 setattr(self, name, obj) |
643 setattr(self, name, obj) |
644 self.CTNParams = (name, obj) |
644 self.CTNParams = (name, obj) |
645 xmlfile.close() |
645 xmlfile.close() |
646 except Exception, exc: |
646 except Exception as exc: |
647 msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) |
647 msg = _("Couldn't load confnode parameters {a1} :\n {a2}").format(a1=ConfNodeName, a2=unicode(exc)) |
648 self.GetCTRoot().logger.write_error(msg) |
648 self.GetCTRoot().logger.write_error(msg) |
649 self.GetCTRoot().logger.write_error(traceback.format_exc()) |
649 self.GetCTRoot().logger.write_error(traceback.format_exc()) |
650 |
650 |
651 def LoadChildren(self): |
651 def LoadChildren(self): |
654 if os.path.isdir(os.path.join(self.CTNPath(), CTNDir)) and \ |
654 if os.path.isdir(os.path.join(self.CTNPath(), CTNDir)) and \ |
655 CTNDir.count(NameTypeSeparator) == 1: |
655 CTNDir.count(NameTypeSeparator) == 1: |
656 pname, ptype = CTNDir.split(NameTypeSeparator) |
656 pname, ptype = CTNDir.split(NameTypeSeparator) |
657 try: |
657 try: |
658 self.CTNAddChild(pname, ptype) |
658 self.CTNAddChild(pname, ptype) |
659 except Exception, exc: |
659 except Exception as exc: |
660 msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=unicode(exc)) |
660 msg = _("Could not add child \"{a1}\", type {a2} :\n{a3}\n").format(a1=pname, a2=ptype, a3=unicode(exc)) |
661 self.GetCTRoot().logger.write_error(msg) |
661 self.GetCTRoot().logger.write_error(msg) |
662 self.GetCTRoot().logger.write_error(traceback.format_exc()) |
662 self.GetCTRoot().logger.write_error(traceback.format_exc()) |