beremiz: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:1b8b5324506c
+:70c1cc354a8f
 def removedataType(self, name):
 self.types.removedataTypeElement(name)
 setattr(cls, "removedataType", removedataType)
-def getpous(self, exclude=None, filter=[]):
+def getpous(self, exclude=None, filter=None):
+filter = [] if filter is None else filter
 return self.xpath(
 "ppx:types/ppx:pous/ppx:pou%s%s" %
 (("[@name!='%s']" % exclude) if exclude is not None else '',
 ("[%s]" % " or ".join(
 map(lambda x: "@pouType='%s'" % x, filter)))
 def GetEnumeratedDataTypeValues(self):
 return [value.getname() for value in enumerated_values_xpath(self)]
 setattr(cls, "GetEnumeratedDataTypeValues", GetEnumeratedDataTypeValues)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 result = self.types.Search(criteria, parent_infos)
 for configuration in self.instances.configurations.getconfiguration():
 result.extend(configuration.Search(criteria, parent_infos))
 return result
 setattr(cls, "Search", Search)
 result = address_model.match(var_address)
 if result is not None:
 variables.remove(variables[i])
-def _SearchInConfigurationResource(self, criteria, parent_infos=[]):
+def _SearchInConfigurationResource(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = _Search([("name", self.getname())], criteria, parent_infos)
 var_number = 0
 for varlist in self.getglobalVars():
 variable_type = searchResultVarTypes.get("globalVars", "var_local")
 variables = varlist.getvariable()
 setattr(cls, "updateElementAddress", updateElementAddress)
 setattr(cls, "removeVariableByAddress", _removeConfigurationResourceVariableByAddress)
 setattr(cls, "removeVariableByFilter", _removeConfigurationResourceVariableByFilter)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 parent_infos = parent_infos + ["C::%s" % self.getname()]
 filter = criteria["filter"]
 if filter == "all" or "configuration" in filter:
 search_result = _SearchInConfigurationResource(self, criteria, parent_infos)
 setattr(cls, "updateElementAddress", updateElementAddress)
 setattr(cls, "removeVariableByAddress", _removeConfigurationResourceVariableByAddress)
 setattr(cls, "removeVariableByFilter", _removeConfigurationResourceVariableByFilter)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 parent_infos = parent_infos[:-1] + ["R::%s::%s" % (parent_infos[-1].split("::")[1], self.getname())]
 search_result = _SearchInConfigurationResource(self, criteria, parent_infos)
 task_number = 0
 instance_number = 0
 for task in self.gettask():
 self.single = update_address(self.single, address_model, new_leading)
 if self.interval is not None:
 self.interval = update_address(self.interval, address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("single", self.getsingle()),
 ("interval", self.getinterval()),
 ("priority", str(self.getpriority()))],
 criteria, parent_infos)
 setattr(cls, "Search", Search)
 def updateElementName(self, old_name, new_name):
 if TextMatched(self.typeName, old_name):
 self.typeName = new_name
 setattr(cls, "updateElementName", updateElementName)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("name", self.getname()),
 ("type", self.gettypeName())],
 criteria, parent_infos)
 setattr(cls, "Search", Search)
 return "ARRAY [%s] OF %s" % (",".join(map(lambda x: "%s..%s" % (x.getlower(), x.getupper()), vartype_content.getdimension())), basetype_name)
 # Variable type is an elementary type
 return vartype_content_name
 setattr(cls, "gettypeAsText", gettypeAsText)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = _Search([("name", self.getname()),
 ("type", self.gettypeAsText()),
 ("location", self.getaddress())],
 criteria, parent_infos)
 initial = self.getinitialValue()
 break
 if not found:
 raise ValueError(_("\"%s\" POU doesn't exist !!!") % name)
 setattr(cls, "removepouElement", removepouElement)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 for datatype in self.dataTypes.getdataType():
 search_result.extend(datatype.Search(criteria, parent_infos))
 for pou in self.pous.getpou():
 search_result.extend(pou.Search(criteria, parent_infos))
 def _updateDataTypeDataTypesClass(cls):
 setattr(cls, "updateElementName", _updateBaseTypeElementName)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 filter = criteria["filter"]
 if filter == "all" or "datatype" in filter:
 parent_infos = parent_infos + ["D::%s" % self.getname()]
 search_result.extend(_Search([("name", self.getname())], criteria, parent_infos))
 elif content_name == "struct":
 for element in self.content.getvariable():
 element.type.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 content_name = self.content.getLocalTag()
 if content_name in ["derived", "array", "enum", "subrangeSigned", "subrangeUnsigned"]:
 search_result.extend(self.content.Search(criteria, parent_infos + ["base"]))
 elif content_name == "struct":
 def updateElementName(self, old_name, new_name):
 if TextMatched(self.name, old_name):
 self.name = new_name
 setattr(cls, "updateElementName", updateElementName)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return [(tuple(parent_infos),) + result for result in TestTextElement(self.name, criteria)]
 setattr(cls, "Search", Search)
 cls = PLCOpenParser.GetElementClass("derived", "dataType")
 def _updateArrayDataTypeClass(cls):
 setattr(cls, "updateElementName", _updateBaseTypeElementName)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = self.baseType.Search(criteria, parent_infos)
 for i, dimension in enumerate(self.getdimension()):
 search_result.extend(_Search([("lower", dimension.getlower()),
 ("upper", dimension.getupper())],
 criteria, parent_infos + ["range", i]))
 # ----------------------------------------------------------------------
-def _SearchInSubrange(self, criteria, parent_infos=[]):
+def _SearchInSubrange(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = self.baseType.Search(criteria, parent_infos)
 search_result.extend(_Search([("lower", self.range.getlower()),
 ("upper", self.range.getupper())],
 criteria, parent_infos))
 return search_result
 pass
 setattr(cls, "updateElementName", updateElementName)
 enumerated_datatype_values_xpath = PLCOpen_XPath("ppx:values/ppx:value")
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 for i, value in enumerate(enumerated_datatype_values_xpath(self)):
 for result in TestTextElement(value.getname(), criteria):
 search_result.append((tuple(parent_infos + ["value", i]),) + result)
 return search_result
 result = address_model.match(var_address)
 if result is not None:
 content.remove(variable)
 setattr(cls, "removeVariableByFilter", removeVariableByFilter)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 search_result = []
 filter = criteria["filter"]
 if filter == "all" or self.getpouType() in filter:
 if parent_infos == []:
 parent_infos = parent_infos + ["P::%s" % self.getname()]
 else:
 for element in self.content.getcontent():
 element.updateElementAddress(address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 if self.content.getLocalTag() in ["IL", "ST"]:
 search_result = self.content.Search(criteria, parent_infos + ["body", 0])
 else:
 search_result = []
 for element in self.content.getcontent():
 def _updateElementAddress(self, address_model, new_leading):
 pass
-def _SearchInElement(self, criteria, parent_infos=[]):
+def _SearchInElement(self, criteria, parent_infos=None):
 return []
 _connectionsFunctions = {
 "bbox": {"none": _getBoundingBox,
 def updateElementAddress(self, address_model, new_leading):
 self.content.updateElementAddress(address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return self.content.Search(criteria, parent_infos + ["comment", self.getlocalId(), "content"])
 setattr(cls, "Search", Search)
 cls = _initElementClass("comment", "commonObjects")
 _translate(self, dx, dy)
 for input in self.inputVariables.getvariable():
 _translateConnections(input.connectionPointIn, dx, dy)
 setattr(cls, "translate", translate)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 parent_infos = parent_infos + ["block", self.getlocalId()]
 search_result = _Search([("name", self.getinstanceName()),
 ("type", self.gettypeName())],
 criteria, parent_infos)
 for i, variable in enumerate(self.inputVariables.getvariable()):
 def _UpdateLDElementAddress(self, address_model, new_leading):
 self.variable = update_address(self.variable, address_model, new_leading)
 def _getSearchInLDElement(ld_element_type):
-def SearchInLDElement(self, criteria, parent_infos=[]):
+def SearchInLDElement(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("reference", self.variable)], criteria, parent_infos + [ld_element_type, self.getlocalId()])
 return SearchInLDElement
 # ----------------------------------------------------------------------
 # ----------------------------------------------------------------------
 def _updateStepSfcObjectSingleClass(cls):
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("name", self.getname())], criteria, parent_infos + ["step", self.getlocalId()])
 setattr(cls, "Search", Search)
 cls = _initElementClass("step", "sfcObjects", "single")
 if condition_connection is not None:
 return condition_connection.getconnections()
 return None
 setattr(cls, "getconnections", getconnections)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 parent_infos = parent_infos + ["transition", self.getlocalId()]
 search_result = []
 content = self.condition.getcontent()
 content_name = content.getLocalTag()
 if content_name == "reference":
 self.reference.setname(update_address(self.reference.getname(), address_model, new_leading))
 if self.inline is not None:
 self.inline.updateElementAddress(address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 qualifier = self.getqualifier()
 if qualifier is None:
 qualifier = "N"
 return _Search([("inline", self.getinlineContent()),
 ("reference", self.getreferenceName()),
 def updateElementAddress(self, address_model, new_leading):
 for action in self.action:
 action.updateElementAddress(address_model, new_leading)
 setattr(cls, "updateElementAddress", updateElementAddress)
-def Search(self, criteria, parent_infos=[]):
+def Search(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 parent_infos = parent_infos + ["action_block", self.getlocalId()]
 search_result = []
 for idx, action in enumerate(self.action):
 search_result.extend(action.Search(criteria, parent_infos + ["action", idx]))
 return search_result
 # ----------------------------------------------------------------------
-def _SearchInIOVariable(self, criteria, parent_infos=[]):
+def _SearchInIOVariable(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("expression", self.expression)], criteria, parent_infos + ["io_variable", self.getlocalId()])
 def _UpdateIOElementName(self, old_name, new_name):
 if TextMatched(self.expression, old_name):
 setattr(cls, "updateElementName", _UpdateIOElementName)
 setattr(cls, "updateElementAddress", _UpdateIOElementAddress)
 setattr(cls, "Search", _SearchInIOVariable)
-def _SearchInConnector(self, criteria, parent_infos=[]):
+def _SearchInConnector(self, criteria, parent_infos=None):
+parent_infos = [] if parent_infos is None else parent_infos
 return _Search([("name", self.getname())], criteria, parent_infos + ["connector", self.getlocalId()])
 # ----------------------------------------------------------------------

changeset 1852	70c1cc354a8f
parent 1850	614396cbffbf
child 1872	866fb3ab8778