From 08ca260e82473f3630ce4dacb8f49fbef839b275 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 21 Jul 2019 15:25:48 +0200 Subject: [PATCH] Simplify return valuef rom _load_object --- freqtrade/resolvers/hyperopt_resolver.py | 12 ++++-------- freqtrade/resolvers/iresolver.py | 6 +++--- freqtrade/resolvers/pairlist_resolver.py | 6 ++---- freqtrade/resolvers/strategy_resolver.py | 6 ++---- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/freqtrade/resolvers/hyperopt_resolver.py b/freqtrade/resolvers/hyperopt_resolver.py index 3f8d03fd2..3f39bd41d 100644 --- a/freqtrade/resolvers/hyperopt_resolver.py +++ b/freqtrade/resolvers/hyperopt_resolver.py @@ -63,10 +63,8 @@ class HyperOptResolver(IResolver): # Add extra hyperopt directory on top of search paths abs_paths.insert(0, Path(extra_dir)) - (hyperopt, module_path) = self._load_object(paths=abs_paths, - object_type=IHyperOpt, - object_name=hyperopt_name, - kwargs={}) + hyperopt = self._load_object(paths=abs_paths, object_type=IHyperOpt, + object_name=hyperopt_name) if hyperopt: return hyperopt raise OperationalException( @@ -120,10 +118,8 @@ class HyperOptLossResolver(IResolver): # Add extra hyperopt directory on top of search paths abs_paths.insert(0, Path(extra_dir)) - (hyperoptloss, module_path) = self._load_object(paths=abs_paths, - object_type=IHyperOptLoss, - object_name=hyper_loss_name, - kwargs={}) + hyperoptloss = self._load_object(paths=abs_paths, object_type=IHyperOptLoss, + object_name=hyper_loss_name) if hyperoptloss: return hyperoptloss diff --git a/freqtrade/resolvers/iresolver.py b/freqtrade/resolvers/iresolver.py index aafc4b0dd..192a38beb 100644 --- a/freqtrade/resolvers/iresolver.py +++ b/freqtrade/resolvers/iresolver.py @@ -67,7 +67,7 @@ class IResolver(object): @staticmethod def _load_object(paths: List[Path], object_type, object_name: str, - kwargs: dict = {}) -> Union[Tuple[Any, Path], Tuple[None, None]]: + kwargs: dict = {}) -> Union[Any, None]: """ Try to load object from path list. """ @@ -82,8 +82,8 @@ class IResolver(object): logger.info( f"Using resolved {object_type.__name__.lower()[1:]} {object_name} " f"from '{module_path}'...") - return (module, module_path) + return module except FileNotFoundError: logger.warning('Path "%s" does not exist.', _path.relative_to(Path.cwd())) - return (None, None) + return None diff --git a/freqtrade/resolvers/pairlist_resolver.py b/freqtrade/resolvers/pairlist_resolver.py index a74ce1cf7..3d95c0295 100644 --- a/freqtrade/resolvers/pairlist_resolver.py +++ b/freqtrade/resolvers/pairlist_resolver.py @@ -43,10 +43,8 @@ class PairListResolver(IResolver): current_path, ] - (pairlist, module_path) = self._load_object(paths=abs_paths, - object_type=IPairList, - object_name=pairlist_name, - kwargs=kwargs) + pairlist = self._load_object(paths=abs_paths, object_type=IPairList, + object_name=pairlist_name, kwargs=kwargs) if pairlist: return pairlist raise OperationalException( diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index ac053399e..aa73327ff 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -147,10 +147,8 @@ class StrategyResolver(IResolver): # register temp path with the bot abs_paths.insert(0, temp.resolve()) - (strategy, module_path) = self._load_object(paths=abs_paths, - object_type=IStrategy, - object_name=strategy_name, - kwargs={'config': config}) + strategy = self._load_object(paths=abs_paths, object_type=IStrategy, + object_name=strategy_name, kwargs={'config': config}) if strategy: strategy._populate_fun_len = len(getfullargspec(strategy.populate_indicators).args) strategy._buy_fun_len = len(getfullargspec(strategy.populate_buy_trend).args)