adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return generator instead of Object from _get_valid_object

Browse Source
This commit is contained in:
Matthias 2019-10-14 14:41:39 +02:00
parent 06ab51b53d
commit 1a765f1a17
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freqtrade/resolvers/iresolver.py
View File

@ -7,7 +7,7 @@ import importlib.util
import inspect import inspect
import logging import logging
from pathlib import Path from pathlib import Path
from typing import Any, List, Optional, Tuple, Type, Union from typing import Any, List, Optional, Tuple, Type, Union, Generator
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -19,13 +19,13 @@ class IResolver:
@staticmethod @staticmethod
def _get_valid_object(object_type, module_path: Path, def _get_valid_object(object_type, module_path: Path,
object_name: str) -> Optional[Type[Any]]: object_name: str) -> Generator[Any, None, None]:
""" """
Returns the first object with matching object_type and object_name in the path given. Generator returning objects with matching object_type and object_name in the path given.
:param object_type: object_type (class) :param object_type: object_type (class)
:param module_path: absolute path to the module :param module_path: absolute path to the module
:param object_name: Class name of the object :param object_name: Class name of the object
:return: class or None :return: generator containing matching objects
""" """
# Generate spec based on absolute path # Generate spec based on absolute path
@ -42,7 +42,7 @@ class IResolver:
obj for name, obj in inspect.getmembers(module, inspect.isclass) obj for name, obj in inspect.getmembers(module, inspect.isclass)
if object_name == name and object_type in obj.__bases__ if object_name == name and object_type in obj.__bases__
) )
return next(valid_objects_gen, None) return valid_objects_gen
@staticmethod @staticmethod
def _search_object(directory: Path, object_type, object_name: str, def _search_object(directory: Path, object_type, object_name: str,
@ -59,9 +59,9 @@ class IResolver:
logger.debug('Ignoring %s', entry) logger.debug('Ignoring %s', entry)
continue continue
module_path = entry.resolve() module_path = entry.resolve()
obj = IResolver._get_valid_object(
object_type, module_path, object_name obj = next(IResolver._get_valid_object(object_type, module_path, object_name), None)
)
if obj: if obj:
return (obj(**kwargs), module_path) return (obj(**kwargs), module_path)
return (None, None) return (None, None)