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

Arguments(): Change private methods to public

Browse Source
This commit is contained in:
Gerald Lonlas 2018-03-04 17:51:57 -08:00
parent de468c6fc8
commit d685646446
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
freqtrade/arguments.py
View File

@ -21,7 +21,9 @@ class Arguments(object):
self.args = args self.args = args
self.parsed_arg = None self.parsed_arg = None
self.parser = argparse.ArgumentParser(description=description) self.parser = argparse.ArgumentParser(description=description)
self._common_args_parser()
def _load_args(self):
self.common_args_parser()
self._build_subcommands() self._build_subcommands()
def get_parsed_arg(self) -> List[str]: def get_parsed_arg(self) -> List[str]:
@ -29,11 +31,13 @@ class Arguments(object):
Return the list of arguments Return the list of arguments
:return: List[str] List of arguments :return: List[str] List of arguments
""" """
self.parsed_arg = self._parse_args() if self.parsed_arg is None:
self._load_args()
self.parsed_arg = self.parse_args()
return self.parsed_arg return self.parsed_arg
def _parse_args(self) -> List[str]: def parse_args(self) -> List[str]:
""" """
Parses given arguments and returns an argparse Namespace instance. Parses given arguments and returns an argparse Namespace instance.
""" """
@ -41,7 +45,7 @@ class Arguments(object):
return parsed_arg return parsed_arg
def _common_args_parser(self) -> None: def common_args_parser(self) -> None:
""" """
Parses given common arguments and returns them as a parsed object. Parses given common arguments and returns them as a parsed object.
""" """
@ -101,7 +105,7 @@ class Arguments(object):
) )
@staticmethod @staticmethod
def _backtesting_options(parser: argparse.ArgumentParser) -> None: def backtesting_options(parser: argparse.ArgumentParser) -> None:
""" """
Parses given arguments for Backtesting scripts. Parses given arguments for Backtesting scripts.
""" """
@ -128,7 +132,7 @@ class Arguments(object):
) )
@staticmethod @staticmethod
def _optimizer_shared_options(parser: argparse.ArgumentParser) -> None: def optimizer_shared_options(parser: argparse.ArgumentParser) -> None:
parser.add_argument( parser.add_argument(
'-i', '--ticker-interval', '-i', '--ticker-interval',
help='specify ticker interval in minutes (1, 5, 30, 60, 1440)', help='specify ticker interval in minutes (1, 5, 30, 60, 1440)',
@ -151,7 +155,7 @@ class Arguments(object):
) )
@staticmethod @staticmethod
def _hyperopt_options(parser: argparse.ArgumentParser) -> None: def hyperopt_options(parser: argparse.ArgumentParser) -> None:
""" """
Parses given arguments for Hyperopt scripts. Parses given arguments for Hyperopt scripts.
""" """
@ -191,14 +195,14 @@ class Arguments(object):
# Add backtesting subcommand # Add backtesting subcommand
backtesting_cmd = subparsers.add_parser('backtesting', help='backtesting module') backtesting_cmd = subparsers.add_parser('backtesting', help='backtesting module')
backtesting_cmd.set_defaults(func=backtesting.start) backtesting_cmd.set_defaults(func=backtesting.start)
self._optimizer_shared_options(backtesting_cmd) self.optimizer_shared_options(backtesting_cmd)
self._backtesting_options(backtesting_cmd) self.backtesting_options(backtesting_cmd)
# Add hyperopt subcommand # Add hyperopt subcommand
hyperopt_cmd = subparsers.add_parser('hyperopt', help='hyperopt module') hyperopt_cmd = subparsers.add_parser('hyperopt', help='hyperopt module')
hyperopt_cmd.set_defaults(func=hyperopt.start) hyperopt_cmd.set_defaults(func=hyperopt.start)
self._optimizer_shared_options(hyperopt_cmd) self.optimizer_shared_options(hyperopt_cmd)
self._hyperopt_options(hyperopt_cmd) self.hyperopt_options(hyperopt_cmd)
@staticmethod @staticmethod
def parse_timerange(text: str) -> (List, int, int): def parse_timerange(text: str) -> (List, int, int):

2
freqtrade/tests/test_arguments.py
View File

@ -17,7 +17,7 @@ def test_arguments_object() -> None:
:return: None :return: None
""" """
assert hasattr(Arguments, 'get_parsed_arg') assert hasattr(Arguments, 'get_parsed_arg')
assert hasattr(Arguments, '_parse_args') assert hasattr(Arguments, 'parse_args')
assert hasattr(Arguments, 'parse_timerange') assert hasattr(Arguments, 'parse_timerange')
assert hasattr(Arguments, 'scripts_options') assert hasattr(Arguments, 'scripts_options')