cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove the wide try/expect clause

Browse source 
This doesn't catch anything precise, and none of the methods should
throw a expection for anything. This also hide python 3 errors.
This commit is contained in:
Michael Scherer 2016-10-16 16:40:45 +02:00 committed by Matt Clay
parent adc56e52d8
commit c9da5e98a9
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/ansible/modules/system/authorized_key.py
View file

@ -243,25 +243,22 @@ def parseoptions(module, options):
'''
options_dict = keydict() #ordered dict
if options:
try:
# the following regex will split on commas while
# ignoring those commas that fall within quotes
regex = re.compile(r'''((?:[^,"']|"[^"]*"|'[^']*')+)''')
parts = regex.split(options)[1:-1]
for part in parts:
if "=" in part:
(key, value) = part.split("=", 1)
if options_dict.has_key(key):
if isinstance(options_dict[key], list):
options_dict[key].append(value)
else:
options_dict[key] = [options_dict[key], value]
# the following regex will split on commas while
# ignoring those commas that fall within quotes
regex = re.compile(r'''((?:[^,"']|"[^"]*"|'[^']*')+)''')
parts = regex.split(options)[1:-1]
for part in parts:
if "=" in part:
(key, value) = part.split("=", 1)
if options_dict.has_key(key):
if isinstance(options_dict[key], list):
options_dict[key].append(value)
else:
options_dict[key] = value
elif part != ",":
options_dict[part] = None
except:
module.fail_json(msg="invalid option string: %s" % options)
options_dict[key] = [options_dict[key], value]
else:
options_dict[key] = value
elif part != ",":
options_dict[part] = None
return options_dict