Simplify configuration init where possible

freqtrade · Sep 13, 2019 · f163240 · f163240
1 parent 4d566e8
commit f163240
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py
@@ -106,10 +106,7 @@ def _process_logging_options(self, config: Dict[str, Any]) -> None:
         the -v/--verbose, --logfile options
         """
         # Log level
-        if 'verbosity' in self.args and self.args["verbosity"]:
-            config.update({'verbosity': self.args["verbosity"]})
-        else:
-            config.update({'verbosity': 0})
+        config.update({'verbosity': self.args.get("verbosity", 0)})
 
         if 'logfile' in self.args and self.args["logfile"]:
             config.update({'logfile': self.args["logfile"]})
@@ -121,8 +118,8 @@ def _process_common_options(self, config: Dict[str, Any]) -> None:
         self._process_logging_options(config)
 
         # Set strategy if not specified in config and or if it's non default
-        if self.args["strategy"] != constants.DEFAULT_STRATEGY or not config.get('strategy'):
-            config.update({'strategy': self.args["strategy"]})
+        if self.args.get("strategy") != constants.DEFAULT_STRATEGY or not config.get('strategy'):
+            config.update({'strategy': self.args.get("strategy")})
 
         self._args_to_config(config, argname='strategy_path',
                              logstring='Using additional Strategy lookup path: {}')
@@ -175,10 +172,7 @@ def _process_datadir_options(self, config: Dict[str, Any]) -> None:
         config['user_data_dir'] = create_userdata_dir(config['user_data_dir'], create_dir=False)
         logger.info('Using user-data directory: %s ...', config['user_data_dir'])
 
-        if 'datadir' in self.args and self.args["datadir"]:
-            config.update({'datadir': create_datadir(config, self.args["datadir"])})
-        else:
-            config.update({'datadir': create_datadir(config, None)})
+        config.update({'datadir': create_datadir(config, self.args.get("datadir", None))})
         logger.info('Using data directory: %s ...', config.get('datadir'))
 
     def _process_optimize_options(self, config: Dict[str, Any]) -> None: