diff options
Diffstat (limited to 'include/Face.py')
| -rw-r--r-- | include/Face.py | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/include/Face.py b/include/Face.py index 08ac7a936..319ce41e5 100644 --- a/include/Face.py +++ b/include/Face.py @@ -1,36 +1,35 @@ # Module for reading and parsing Scintilla.iface file -import string def sanitiseLine(line): if line[-1:] == '\n': line = line[:-1] - if string.find(line, "##") != -1: - line = line[:string.find(line, "##")] - line = string.strip(line) + if line.find("##") != -1: + line = line[:line.find("##")] + line = line.strip() return line def decodeFunction(featureVal): - retType, rest = string.split(featureVal, " ", 1) - nameIdent, params = string.split(rest, "(") - name, value = string.split(nameIdent, "=") - params, rest = string.split(params, ")") - param1, param2 = string.split(params, ",")[0:2] + retType, rest = featureVal.split(" ", 1) + nameIdent, params = rest.split("(") + name, value = nameIdent.split("=") + params, rest = params.split(")") + param1, param2 = params.split(",")[0:2] return retType, name, value, param1, param2 def decodeEvent(featureVal): - retType, rest = string.split(featureVal, " ", 1) - nameIdent, params = string.split(rest, "(") - name, value = string.split(nameIdent, "=") + retType, rest = featureVal.split(" ", 1) + nameIdent, params = rest.split("(") + name, value = nameIdent.split("=") return retType, name, value def decodeParam(p): - param = string.strip(p) + param = p.strip() type = "" name = "" value = "" if " " in param: - type, nv = string.split(param, " ") + type, nv = param.split(" ") if "=" in nv: - name, value = string.split(nv, "=") + name, value = nv.split("=") else: name = nv return type, name, value @@ -59,7 +58,7 @@ class Face: currentComment.append(line[2:]) else: currentCommentFinished = 1 - featureType, featureVal = string.split(line, " ", 1) + featureType, featureVal = line.split(" ", 1) if featureType in ["fun", "get", "set"]: retType, name, value, param1, param2 = decodeFunction(featureVal) p1 = decodeParam(param1) @@ -72,7 +71,7 @@ class Face: "Param2Type": p2[0], "Param2Name": p2[1], "Param2Value": p2[2], "Category": currentCategory, "Comment": currentComment } - if self.values.has_key(value): + if value in self.values: raise "Duplicate value " + value + " " + name self.values[value] = 1 self.order.append(name) @@ -84,21 +83,21 @@ class Face: "Value": value, "Category": currentCategory, "Comment": currentComment } - if self.events.has_key(value): + if value in self.events: raise "Duplicate event " + value + " " + name self.events[value] = 1 self.order.append(name) elif featureType == "cat": currentCategory = featureVal elif featureType == "val": - name, value = string.split(featureVal, "=", 1) + name, value = featureVal.split("=", 1) self.features[name] = { "FeatureType": featureType, "Category": currentCategory, "Value": value } self.order.append(name) elif featureType == "enu" or featureType == "lex": - name, value = string.split(featureVal, "=", 1) + name, value = featureVal.split("=", 1) self.features[name] = { "FeatureType": featureType, "Category": currentCategory, |