gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-23 06:37:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix some issues in the template error handling code.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-03-21 15:30:26 -04:00
parent c7249edd3c
commit fac3d9a09f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wicd/misc.py
View File

@@ -295,12 +295,10 @@ def __parse_field_ent(fields, field_type='require'):
ret = [] ret = []
# We need an even number of entries in the line for it to be valid. # We need an even number of entries in the line for it to be valid.
if (len(fields) % 2) != 0: if (len(fields) % 2) != 0:
print "Invalid '%s' line found in template %s" % (field_type, enctype)
return None return None
else: else:
for val, disp_val in grouper(2, fields, fillvalue=None): for val, disp_val in grouper(2, fields, fillvalue=None):
if val.startswith("*") or not disp_val.startswith("*"): if val.startswith("*") or not disp_val.startswith("*"):
print "Invalid '%s' line found in template %s" % (field_type, enctype)
return None return None
ret.append([val, disp_val[1:]]) ret.append([val, disp_val[1:]])
return ret return ret
@@ -321,14 +319,15 @@ def _parse_enc_template(enctype):
cur_type["fields"] = [] cur_type["fields"] = []
cur_type['optional'] = [] cur_type['optional'] = []
cur_type['required'] = [] cur_type['required'] = []
cur_type['name'] = ""
for index, line in enumerate(f): for index, line in enumerate(f):
if line.startswith("name") and not "name" in cur_type: if line.startswith("name") and not cur_type["name"]:
cur_type["name"] = parse_ent(line, "name") cur_type["name"] = parse_ent(line, "name")
elif line.startswith("require"): elif line.startswith("require"):
cur_type["required"] = __parse_field_ent(parse_ent(line, cur_type["required"] = __parse_field_ent(parse_ent(line, "require"))
"require"))
if not cur_type["required"]: if not cur_type["required"]:
# An error occured parsing the require line. # An error occured parsing the require line.
print "Invalid 'required' line found in template %s" % enctype
continue continue
elif line.startswith("optional"): elif line.startswith("optional"):
cur_type["optional"] = __parse_field_ent(parse_ent(line, cur_type["optional"] = __parse_field_ent(parse_ent(line,
@@ -336,6 +335,7 @@ def _parse_enc_template(enctype):
field_type="optional") field_type="optional")
if not cur_type["optional"]: if not cur_type["optional"]:
# An error occured parsing the optional line. # An error occured parsing the optional line.
print "Invalid 'optional' line found in template %s" % enctype
continue continue
elif line.startswith("----"): elif line.startswith("----"):
# We're done. # We're done.