beremiz: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:dea107dce0c4
+:750eeb7230a1
 time_values = [int(v) for v in values[:2]]
 seconds = float(values[2])
 time_values.extend([int(seconds), int((seconds % 1) * 1000000)])
 text = "T#"
 if time_values[0] != 0:
-text += "%dh"%time_values[0]
+text += "%dh" % time_values[0]
 if time_values[1] != 0:
-text += "%dm"%time_values[1]
+text += "%dm" % time_values[1]
 if time_values[2] != 0:
-text += "%ds"%time_values[2]
+text += "%ds" % time_values[2]
 if time_values[3] != 0:
 if time_values[3] % 1000 != 0:
-text += "%.3fms"%(float(time_values[3]) / 1000)
+text += "%.3fms" % (float(time_values[3]) / 1000)
 else:
-text += "%dms"%(time_values[3] / 1000)
+text += "%dms" % (time_values[3] / 1000)
 task.set("interval", text)
 # Update resources pou instance attributes
 for pouInstance in ResourceInstancesXpath(resource):
 type_name = pouInstance.attrib.pop("type")
 setattr(cls, "getdataType", gettypeElementFunc("dataType"))
 def appenddataType(self, name):
 if self.getdataType(name) is not None:
-raise ValueError, "\"%s\" Data Type already exists !!!"%name
+raise ValueError, "\"%s\" Data Type already exists !!!" % name
 self.types.appenddataTypeElement(name)
 setattr(cls, "appenddataType", appenddataType)
 def insertdataType(self, index, datatype):
 self.types.insertdataTypeElement(index, datatype)
 if TextMatched(element.getname(), name):
 self.dataTypes.remove(element)
 found = True
 break
 if not found:
-raise ValueError, _("\"%s\" Data Type doesn't exist !!!")%name
+raise ValueError, _("\"%s\" Data Type doesn't exist !!!") % name
 setattr(cls, "removedataTypeElement", removedataTypeElement)
 def getpouElements(self):
 return self.pous.getpou()
 setattr(cls, "getpouElements", getpouElements)
 setattr(cls, "getpouElement", getpouElement)
 def appendpouElement(self, name, pou_type, body_type):
 for element in self.pous.getpou():
 if TextMatched(element.getname(), name):
-raise ValueError, _("\"%s\" POU already exists !!!")%name
+raise ValueError, _("\"%s\" POU already exists !!!") % name
 new_pou = PLCOpenParser.CreateElement("pou", "pous")
 self.pous.appendpou(new_pou)
 new_pou.setname(name)
 new_pou.setpouType(pou_type)
 new_pou.appendbody(PLCOpenParser.CreateElement("body", "pou"))
 if TextMatched(element.getname(), name):
 self.pous.remove(element)
 found = True
 break
 if not found:
-raise ValueError, _("\"%s\" POU doesn't exist !!!")%name
+raise ValueError, _("\"%s\" POU doesn't exist !!!") % name
 setattr(cls, "removepouElement", removepouElement)
 def Search(self, criteria, parent_infos=[]):
 search_result = []
 filter = criteria["filter"]
 def setbodyType(self, body_type):
 if len(self.body) > 0:
 if body_type in ["IL", "ST", "LD", "FBD", "SFC"]:
 self.body[0].setcontent(PLCOpenParser.CreateElement(body_type, "body"))
 else:
-raise ValueError, "%s isn't a valid body type!"%type
+raise ValueError, "%s isn't a valid body type!" % type
 setattr(cls, "setbodyType", setbodyType)
 def getbodyType(self):
 if len(self.body) > 0:
 return self.body[0].getcontent().getLocalTag()
 instance.getinstanceName())
 self.transitions.remove(transition)
 removed = True
 break
 if not removed:
-raise ValueError, _("Transition with name %s doesn't exist!")%name
+raise ValueError, _("Transition with name %s doesn't exist!") % name
 setattr(cls, "removetransition", removetransition)
 def addaction(self, name, body_type):
 if self.actions is None:
 self.addactions()
 instance.getinstanceName())
 self.actions.remove(action)
 removed = True
 break
 if not removed:
-raise ValueError, _("Action with name %s doesn't exist!")%name
+raise ValueError, _("Action with name %s doesn't exist!") % name
 setattr(cls, "removeaction", removeaction)
 def updateElementName(self, old_name, new_name):
 if self.interface is not None:
 for content in self.interface.getcontent():
 def setbodyType(self, body_type):
 if body_type in ["IL", "ST", "LD", "FBD", "SFC"]:
 self.body.setcontent(PLCOpenParser.CreateElement(body_type, "body"))
 else:
-raise ValueError, "%s isn't a valid body type!"%type
+raise ValueError, "%s isn't a valid body type!" % type
 def getbodyType(self):
 return self.body.getcontent().getLocalTag()
 def resetexecutionOrder(self):
 def appendcontentInstance(self, instance):
 if self.content.getLocalTag() in ["LD","FBD","SFC"]:
 self.content.appendcontent(instance)
 else:
-raise TypeError, _("%s body don't have instances!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have instances!") % self.content.getLocalTag()
 setattr(cls, "appendcontentInstance", appendcontentInstance)
 def getcontentInstances(self):
 if self.content.getLocalTag() in ["LD","FBD","SFC"]:
 return self.content.getcontent()
 else:
-raise TypeError, _("%s body don't have instances!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have instances!") % self.content.getLocalTag()
 setattr(cls, "getcontentInstances", getcontentInstances)
 instance_by_id_xpath = PLCOpen_XPath("*[@localId=$localId]")
 instance_by_name_xpath = PLCOpen_XPath("ppx:block[@instanceName=$name]")
 def getcontentInstance(self, local_id):
 instance = instance_by_id_xpath(self.content, localId=local_id)
 if len(instance) > 0:
 return instance[0]
 return None
 else:
-raise TypeError, _("%s body don't have instances!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have instances!") % self.content.getLocalTag()
 setattr(cls, "getcontentInstance", getcontentInstance)
 def getcontentInstancesIds(self):
 if self.content.getLocalTag() in ["LD","FBD","SFC"]:
 return OrderedDict([(instance.getlocalId(), True)
 for instance in self.content])
 else:
-raise TypeError, _("%s body don't have instances!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have instances!") % self.content.getLocalTag()
 setattr(cls, "getcontentInstancesIds", getcontentInstancesIds)
 def getcontentInstanceByName(self, name):
 if self.content.getLocalTag() in ["LD","FBD","SFC"]:
 instance = instance_by_name_xpath(self.content)
 if len(instance) > 0:
 return instance[0]
 return None
 else:
-raise TypeError, _("%s body don't have instances!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have instances!") % self.content.getLocalTag()
 setattr(cls, "getcontentInstanceByName", getcontentInstanceByName)
 def removecontentInstance(self, local_id):
 if self.content.getLocalTag() in ["LD","FBD","SFC"]:
 instance = instance_by_id_xpath(self.content, localId=local_id)
 if len(instance) > 0:
 self.content.remove(instance[0])
 else:
-raise ValueError, _("Instance with id %d doesn't exist!")%id
+raise ValueError, _("Instance with id %d doesn't exist!") % id
 else:
-raise TypeError, "%s body don't have instances!"%self.content.getLocalTag()
+raise TypeError, "%s body don't have instances!" % self.content.getLocalTag()
 setattr(cls, "removecontentInstance", removecontentInstance)
 def settext(self, text):
 if self.content.getLocalTag() in ["IL","ST"]:
 self.content.setanyText(text)
 else:
-raise TypeError, _("%s body don't have text!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have text!") % self.content.getLocalTag()
 setattr(cls, "settext", settext)
 def gettext(self):
 if self.content.getLocalTag() in ["IL","ST"]:
 return self.content.getanyText()
 else:
-raise TypeError, _("%s body don't have text!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have text!") % self.content.getLocalTag()
 setattr(cls, "gettext", gettext)
 def hasblock(self, block_type):
 if self.content.getLocalTag() in ["IL","ST"]:
 return self.content.hasblock(block_type)
 else:
-raise TypeError, _("%s body don't have text!")%self.content.getLocalTag()
+raise TypeError, _("%s body don't have text!") % self.content.getLocalTag()
 setattr(cls, "hasblock", hasblock)
 def updateElementName(self, old_name, new_name):
 if self.content.getLocalTag() in ["IL", "ST"]:
 self.content.updateElementName(old_name, new_name)
 if opened > closed:
 items[i - 1] = ','.join([items[i - 1], items.pop(i)])
 elif opened == closed:
 i += 1
 else:
-raise ValueError, _("\"%s\" is an invalid value!")%value
+raise ValueError, _("\"%s\" is an invalid value!") % value
 return items
 cls = PLCOpenParser.GetElementClass("arrayValue", "value")
 if cls:
 arrayValue_model = re.compile("([0-9]+)\((.*)\)$")
 repetition = 1
 if repetition > 1:
 value = element.getvalue()
 if value is None:
 value = ""
-values.append("%s(%s)"%(repetition, value))
+values.append("%s(%s)" % (repetition, value))
 else:
 values.append(element.getvalue())
-return "[%s]"%", ".join(values)
+return "[%s]" % ", ".join(values)
 setattr(cls, "getvalue", getvalue)
 cls = PLCOpenParser.GetElementClass("structValue", "value")
 if cls:
 structValue_model = re.compile("(.*):=(.*)")
 setattr(cls, "setvalue", setvalue)
 def getvalue(self):
 values = []
 for element in self.value:
-values.append("%s := %s"%(element.getmember(), element.getvalue()))
+values.append("%s := %s" % (element.getmember(), element.getvalue()))
-return "(%s)"%", ".join(values)
+return "(%s)" % ", ".join(values)
 setattr(cls, "getvalue", getvalue)

changeset 1734	750eeb7230a1
parent 1732	94ffe74e6895
child 1736	7e61baa047f0