YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change try/except position

Browse source
This commit is contained in:
Kload 2012-10-06 18:08:50 +02:00
parent 6800be9543
commit 9a445293ab
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
yunohost
View file

@ -72,7 +72,13 @@ def str2fun(astr):
mod = sys.modules[module] mod = sys.modules[module]
else: else:
mod = sys.modules['__main__'] # or whatever's the "default module" mod = sys.modules['__main__'] # or whatever's the "default module"
return getattr(mod, function)
try:
func = getattr(mod, function)
except NameError:
print 'Error: Function ' + category + '_' + action + '() is not been defined'
sys.exit(1)
return func
""" Intialize parsers """ """ Intialize parsers """
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -83,17 +89,12 @@ parsers = subparsers_category = subparsers_action = dict()
Turn above array into subparsers (e.g. parsers['user_list']) Turn above array into subparsers (e.g. parsers['user_list'])
and assign functions related to (e.g. user_list()) and assign functions related to (e.g. user_list())
""" """
for category, info in parser_array.items(): for category, info in parser_array.items():
subparsers_category[category] = subparsers.add_parser(category, help = info['help']) subparsers_category[category] = subparsers.add_parser(category, help = info['help'])
subparsers_action[category] = subparsers_category[category].add_subparsers() subparsers_action[category] = subparsers_category[category].add_subparsers()
for action, helper in info['actions'].items(): for action, helper in info['actions'].items():
parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help = helper) parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help = helper)
try:
parsers[category + '_' + action].set_defaults(func = str2fun('yunohost_' + category + '.' + category + '_' + action)) parsers[category + '_' + action].set_defaults(func = str2fun('yunohost_' + category + '.' + category + '_' + action))
except AttributeError:
print 'Error: Function ' + category + '_' + action + '() has not been defined'
sys.exit(1)
""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""""""""""""""""""""""""""""""""""""""""""""""""""