diff options
author | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-10-13 17:29:58 -0700 |
---|---|---|
committer | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-10-16 11:53:49 -0700 |
commit | a79debff4a6436522feebd2221865a2a6a917a58 (patch) | |
tree | e798895746a4edddc083b6e618f766d7905a7fbc /nfvbench/config.py | |
parent | 211bc02b88a19153eb33f9a4f6670638bf469676 (diff) |
NFVBENCH-40 Add pylint to tox
Change-Id: Ic55a07145f27c4cfaa6df5523df3940ca4433af1
Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
Diffstat (limited to 'nfvbench/config.py')
-rw-r--r-- | nfvbench/config.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nfvbench/config.py b/nfvbench/config.py index 2ed726d..8139389 100644 --- a/nfvbench/config.py +++ b/nfvbench/config.py @@ -18,7 +18,7 @@ from log import LOG import yaml -def config_load(file_name, from_cfg=None, whitelist_keys=[]): +def config_load(file_name, from_cfg=None, whitelist_keys=None): """Load a yaml file into a config dict, merge with from_cfg if not None The config file content taking precedence in case of duplicate """ @@ -31,13 +31,15 @@ def config_load(file_name, from_cfg=None, whitelist_keys=[]): .format(file_name)) if from_cfg: + if not whitelist_keys: + whitelist_keys = [] _validate_config(cfg, from_cfg, whitelist_keys) cfg = from_cfg + cfg return cfg -def config_loads(cfg_text, from_cfg=None, whitelist_keys=[]): +def config_loads(cfg_text, from_cfg=None, whitelist_keys=None): """Same as config_load but load from a string """ try: @@ -46,10 +48,13 @@ def config_loads(cfg_text, from_cfg=None, whitelist_keys=[]): # empty string cfg = AttrDict() if from_cfg: + if not whitelist_keys: + whitelist_keys = [] _validate_config(cfg, from_cfg, whitelist_keys) return from_cfg + cfg return cfg + def _validate_config(subset, superset, whitelist_keys): def get_err_config(subset, superset): result = {} |