Fixed config file overrode args, matched config val to data.csv.parse() input type

Author: adamlui

remove-json-keys/src/remove_json_keys/lib/settings.py

@@ -68,13 +68,12 @@ def load(cli, caller_file):
         if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
             setattr(parsed_args, attr_name, True)
     for key, val in vars(parsed_args).items(): # apply parsed_args to cli.config
-        if not getattr(cli.config, key, ''):
-            setattr(cli.config, key, val)
+        if val : setattr(cli.config, key, val)
     log.debug('Args parsed!\n{}', cli)
 
     # Init all cli.config vals
     for name, ctrl in vars(controls).items():
-        val = getattr(cli.config, name, None)
+        val = getattr(cli.config, name, '')
         if getattr(ctrl, 'parser', None) == 'csv':
             val = data.csv.parse(val)
         if val is None and hasattr(ctrl, 'default_val'):

translate-messages/src/translate_messages/lib/settings.py

@@ -78,13 +78,12 @@ def load(cli, caller_file):
         if getattr(ctrl, 'subcmd', False) and next(arg for arg in ctrl.args if arg.startswith('--'))[2:] in sys.argv:
             setattr(parsed_args, attr_name, True)
     for key, val in vars(parsed_args).items(): # apply parsed_args to cli.config
-        if not getattr(cli.config, key, ''):
-            setattr(cli.config, key, val)
+        if val : setattr(cli.config, key, val)
     log.debug('Args parsed!\n{}', cli)
 
     # Init all cli.config vals
     for name, ctrl in vars(controls).items():
-        val = getattr(cli.config, name, None)
+        val = getattr(cli.config, name, '')
         if getattr(ctrl, 'parser', None) == 'csv':
             val = data.csv.parse(val)
         if val is None and hasattr(ctrl, 'default_val'):