From d90ab82cec328004e743b2bfbb7c25b32eb299ea Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Fri, 20 May 2022 10:22:42 +0200 Subject: format: use autopep8 Use autopep8 for coding format, and only for whitespace changes. This change drops use of tabs in favor of spaces. Doesn't use autopep8 --aggresive option. Format command: $ autopep8 --inline --recursive . When using git-blame, use --ignore-rev in order to ignore this reformatting commit. --- ogcli | 66 ++++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) (limited to 'ogcli') diff --git a/ogcli b/ogcli index 4cfe339..078a07e 100755 --- a/ogcli +++ b/ogcli @@ -14,39 +14,41 @@ import argparse import json import sys -OG_CLI_CFG_PATH="/opt/opengnsys/etc/ogcli.json" +OG_CLI_CFG_PATH = "/opt/opengnsys/etc/ogcli.json" + class CLI(): - def __init__(self): - try: - with open(OG_CLI_CFG_PATH, 'r') as json_file: - self.cfg = json.load(json_file) - except json.JSONDecodeError: - sys.exit(f'ERROR: Failed parse malformed JSON file ' - f'{OG_CLI_CFG_PATH}') - except: - sys.exit(f'ERROR: cannot open {OG_CLI_CFG_PATH}') - - required_cfg_params = {'api_token', 'ip', 'port'} - difference_cfg_params = required_cfg_params - self.cfg.keys() - if len(difference_cfg_params) > 0: - sys.exit(f'Missing {difference_cfg_params} key in ' - f'json config file') - - self.ogcli = OgCLI(self.cfg) - - parser = argparse.ArgumentParser(prog='ogcli') - parser.add_argument('command', help='Subcommand to run', nargs='?', - choices=[attr for attr, _ in getmembers(self.ogcli, lambda x: ismethod(x)) - if not attr.startswith('_')]) - args = parser.parse_args(sys.argv[1:2]) - - if not hasattr(self.ogcli, args.command): - parser.print_help() - sys.exit('Unknown command') - - # Call the command with the same name. - getattr(self.ogcli, args.command)(sys.argv[2:]) + def __init__(self): + try: + with open(OG_CLI_CFG_PATH, 'r') as json_file: + self.cfg = json.load(json_file) + except json.JSONDecodeError: + sys.exit(f'ERROR: Failed parse malformed JSON file ' + f'{OG_CLI_CFG_PATH}') + except: + sys.exit(f'ERROR: cannot open {OG_CLI_CFG_PATH}') + + required_cfg_params = {'api_token', 'ip', 'port'} + difference_cfg_params = required_cfg_params - self.cfg.keys() + if len(difference_cfg_params) > 0: + sys.exit(f'Missing {difference_cfg_params} key in ' + f'json config file') + + self.ogcli = OgCLI(self.cfg) + + parser = argparse.ArgumentParser(prog='ogcli') + parser.add_argument('command', help='Subcommand to run', nargs='?', + choices=[attr for attr, _ in getmembers(self.ogcli, lambda x: ismethod(x)) + if not attr.startswith('_')]) + args = parser.parse_args(sys.argv[1:2]) + + if not hasattr(self.ogcli, args.command): + parser.print_help() + sys.exit('Unknown command') + + # Call the command with the same name. + getattr(self.ogcli, args.command)(sys.argv[2:]) + if __name__ == "__main__": - CLI() + CLI() -- cgit v1.2.3-18-g5258