# HG changeset patch # User Laurent Bessard # Date 1362563895 -3600 # Node ID dc1318160073827e6ce7bc23d1de2e5f47056e8b # Parent 308e518327118947e6080b193bedfafb2524aef8 Fixed bug when ST/IL code contains non-ascii characters (in comment) and modifying variable name diff -r 308e51832711 -r dc1318160073 plcopen/plcopen.py --- a/plcopen/plcopen.py Wed Mar 06 10:47:06 2013 +0100 +++ b/plcopen/plcopen.py Wed Mar 06 10:58:15 2013 +0100 @@ -129,7 +129,7 @@ cls = PLCOpenClasses.get("formattedText", None) if cls: def updateElementName(self, old_name, new_name): - text = self.text.decode("utf-8") + text = self.text index = text.find(old_name) while index != -1: if index > 0 and (text[index - 1].isalnum() or text[index - 1] == "_"): @@ -139,11 +139,11 @@ else: text = text[:index] + new_name + text[index + len(old_name):] index = text.find(old_name, index + len(new_name)) - self.text = text.encode("utf-8") + self.text = text setattr(cls, "updateElementName", updateElementName) def updateElementAddress(self, address_model, new_leading): - text = self.text.decode("utf-8") + text = self.text startpos = 0 result = address_model.search(text, startpos) while result is not None: @@ -152,7 +152,7 @@ text = text[:result.start()] + new_address + text[result.end():] startpos = result.start() + len(new_address) result = address_model.search(self.text, startpos) - self.text = text.encode("utf-8") + self.text = text setattr(cls, "updateElementAddress", updateElementAddress) def Search(self, criteria, parent_infos):