From 8d94e1aa434c8d42923fc8e17ebcd6f20a81447d Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sun, 23 Jul 2017 05:19:47 +0200 Subject: [PATCH] [mod] simplify code again --- moulinette/actionsmap.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/moulinette/actionsmap.py b/moulinette/actionsmap.py index d0f0f601..2faa6993 100644 --- a/moulinette/actionsmap.py +++ b/moulinette/actionsmap.py @@ -626,14 +626,6 @@ class ActionsMap(object): arguments = action_options.pop('arguments', {}) tid = (namespace, category_name, action_name) - if 'configuration' in action_options: - configuration = action_options.pop('configuration') - _set_conf = lambda p: p.set_conf(tid, configuration) - - else: - # No action configuration - _set_conf = lambda p: False - try: # Get action parser action_parser = category_parser.add_action_parser(action_name, tid, **action_options) @@ -648,6 +640,9 @@ class ActionsMap(object): # Store action identifier and add arguments action_parser.set_defaults(_tid=tid) _add_arguments(tid, action_parser, arguments) - _set_conf(category_parser) + + if 'configuration' in action_options: + configuration = action_options.pop('configuration') + category_parser.set_conf(tid, configuration) return top_parser