From d685646446d4fb2359150dea070b5cbb5301b788 Mon Sep 17 00:00:00 2001 From: Gerald Lonlas Date: Sun, 4 Mar 2018 17:51:57 -0800 Subject: [PATCH] Arguments(): Change private methods to public --- freqtrade/arguments.py | 26 +++++++++++++++----------- freqtrade/tests/test_arguments.py | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/freqtrade/arguments.py b/freqtrade/arguments.py index 8c4624770..30f94fddc 100644 --- a/freqtrade/arguments.py +++ b/freqtrade/arguments.py @@ -21,7 +21,9 @@ class Arguments(object): self.args = args self.parsed_arg = None self.parser = argparse.ArgumentParser(description=description) - self._common_args_parser() + + def _load_args(self): + self.common_args_parser() self._build_subcommands() def get_parsed_arg(self) -> List[str]: @@ -29,11 +31,13 @@ class Arguments(object): Return the 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 - def _parse_args(self) -> List[str]: + def parse_args(self) -> List[str]: """ Parses given arguments and returns an argparse Namespace instance. """ @@ -41,7 +45,7 @@ class Arguments(object): 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. """ @@ -101,7 +105,7 @@ class Arguments(object): ) @staticmethod - def _backtesting_options(parser: argparse.ArgumentParser) -> None: + def backtesting_options(parser: argparse.ArgumentParser) -> None: """ Parses given arguments for Backtesting scripts. """ @@ -128,7 +132,7 @@ class Arguments(object): ) @staticmethod - def _optimizer_shared_options(parser: argparse.ArgumentParser) -> None: + def optimizer_shared_options(parser: argparse.ArgumentParser) -> None: parser.add_argument( '-i', '--ticker-interval', help='specify ticker interval in minutes (1, 5, 30, 60, 1440)', @@ -151,7 +155,7 @@ class Arguments(object): ) @staticmethod - def _hyperopt_options(parser: argparse.ArgumentParser) -> None: + def hyperopt_options(parser: argparse.ArgumentParser) -> None: """ Parses given arguments for Hyperopt scripts. """ @@ -191,14 +195,14 @@ class Arguments(object): # Add backtesting subcommand backtesting_cmd = subparsers.add_parser('backtesting', help='backtesting module') backtesting_cmd.set_defaults(func=backtesting.start) - self._optimizer_shared_options(backtesting_cmd) - self._backtesting_options(backtesting_cmd) + self.optimizer_shared_options(backtesting_cmd) + self.backtesting_options(backtesting_cmd) # Add hyperopt subcommand hyperopt_cmd = subparsers.add_parser('hyperopt', help='hyperopt module') hyperopt_cmd.set_defaults(func=hyperopt.start) - self._optimizer_shared_options(hyperopt_cmd) - self._hyperopt_options(hyperopt_cmd) + self.optimizer_shared_options(hyperopt_cmd) + self.hyperopt_options(hyperopt_cmd) @staticmethod def parse_timerange(text: str) -> (List, int, int): diff --git a/freqtrade/tests/test_arguments.py b/freqtrade/tests/test_arguments.py index 940b3811b..6ad507e85 100644 --- a/freqtrade/tests/test_arguments.py +++ b/freqtrade/tests/test_arguments.py @@ -17,7 +17,7 @@ def test_arguments_object() -> None: :return: None """ assert hasattr(Arguments, 'get_parsed_arg') - assert hasattr(Arguments, '_parse_args') + assert hasattr(Arguments, 'parse_args') assert hasattr(Arguments, 'parse_timerange') assert hasattr(Arguments, 'scripts_options')