From 2c0d0946e6e9a953ef47ad617f8d921ede54685e Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 24 Nov 2018 20:02:29 +0100 Subject: [PATCH] Small stylistic improvements to strategyresolver --- freqtrade/resolvers/iresolver.py | 8 ++------ freqtrade/resolvers/strategyresolver.py | 12 ++++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/freqtrade/resolvers/iresolver.py b/freqtrade/resolvers/iresolver.py index ea38b30c2..37230537e 100644 --- a/freqtrade/resolvers/iresolver.py +++ b/freqtrade/resolvers/iresolver.py @@ -1,7 +1,7 @@ # pragma pylint: disable=attribute-defined-outside-init """ -This module load custom hyperopts +This module load custom objects """ import importlib.util import inspect @@ -9,10 +9,6 @@ import logging import os from typing import Optional, Dict, Type, Any -from freqtrade.constants import DEFAULT_HYPEROPT -from freqtrade.optimize.hyperopt_interface import IHyperOpt - - logger = logging.getLogger(__name__) @@ -51,7 +47,7 @@ class IResolver(object): return next(valid_objects_gen, None) @staticmethod - def _search_object(directory: str, object_type, object_name: str, + def _search_object(directory: str, object_type, object_name: str, kwargs: dict) -> Optional[Any]: """ Search for the objectname in the given directory diff --git a/freqtrade/resolvers/strategyresolver.py b/freqtrade/resolvers/strategyresolver.py index a7f3b2c25..273effe2d 100644 --- a/freqtrade/resolvers/strategyresolver.py +++ b/freqtrade/resolvers/strategyresolver.py @@ -5,7 +5,7 @@ This module load custom strategies """ import inspect import logging -import os +from os import getcwd, path import tempfile from base64 import urlsafe_b64decode from collections import OrderedDict @@ -103,10 +103,10 @@ class StrategyResolver(IResolver): :param extra_dir: additional directory to search for the given strategy :return: Strategy instance or None """ - current_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'strategy') + current_path = path.join(path.dirname(path.dirname(path.realpath(__file__))), 'strategy') abs_paths = [ - os.path.join(os.getcwd(), 'user_data', 'strategies'), + path.join(getcwd(), 'user_data', 'strategies'), current_path, ] @@ -125,14 +125,14 @@ class StrategyResolver(IResolver): temp.joinpath(name).write_text(urlsafe_b64decode(strat[1]).decode('utf-8')) temp.joinpath("__init__.py").touch() - strategy_name = os.path.splitext(name)[0] + strategy_name = path.splitext(name)[0] # register temp path with the bot abs_paths.insert(0, str(temp.resolve())) - for path in abs_paths: + for _path in abs_paths: try: - strategy = self._search_object(directory=path, object_type=IStrategy, + strategy = self._search_object(directory=_path, object_type=IStrategy, object_name=strategy_name, kwargs={'config': config}) if strategy: logger.info('Using resolved strategy %s from \'%s\'', strategy_name, path)