From da6a816713e120935b5749fefbf7f4e3f0d2d09b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 11 May 2025 19:15:11 +0200 Subject: [PATCH] fix: black --- src/rougail/cli/__init__.py | 1 + src/rougail/cli/__main__.py | 84 ++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/src/rougail/cli/__init__.py b/src/rougail/cli/__init__.py index 007e4d3..0847d2c 100644 --- a/src/rougail/cli/__init__.py +++ b/src/rougail/cli/__init__.py @@ -15,4 +15,5 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Mtools. If not, see . """ + from .__version__ import __version__ diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py index 802b8da..76abe05 100644 --- a/src/rougail/cli/__main__.py +++ b/src/rougail/cli/__main__.py @@ -26,6 +26,7 @@ from rougail import Rougail from rougail.config import get_rougail_config from rougail.utils import load_modules from rougail.user_datas import UserDatas + try: from rougail.user_data_yaml import RougailUserDataYaml except ImportError: @@ -44,53 +45,69 @@ def _main(arguments, do_not_print): ) rougailconfig.generate_config() cmd_config = rougailconfig.config - origin_prop = cmd_config.property.default('read_write', 'append') - cmd_config.property.setdefault(frozenset(origin_prop | {"not_for_commandline"}), 'read_write', 'append') + origin_prop = cmd_config.property.default("read_write", "append") + cmd_config.property.setdefault( + frozenset(origin_prop | {"not_for_commandline"}), "read_write", "append" + ) cmd_config.property.read_write() - fake_rougail_config = {'step.user_data': [],} + fake_rougail_config = { + "step.user_data": [], + } fake_user_datas = [] if RougailUserDataYaml: config_file = cmd_config.forcepermissive.option("cli.config_file").value.get() if Path(config_file).is_file(): - fake_rougail_config = {'step.user_data': 'yaml', - 'yaml.filename': [config_file], - 'yaml.file_with_secrets': 'all', - } - fake_user_datas.extend(RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run()) + fake_rougail_config = { + "step.user_data": "yaml", + "yaml.filename": [config_file], + "yaml.file_with_secrets": "all", + } + fake_user_datas.extend( + RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run() + ) if RougailUserDataEnvironment: - fake_rougail_config = {'step.user_data': 'environment', - 'environment.default_environment_name': 'ROUGAILCLI', - } - fake_user_datas.extend(RougailUserDataEnvironment(cmd_config, rougailconfig=fake_rougail_config).run()) + fake_rougail_config = { + "step.user_data": "environment", + "environment.default_environment_name": "ROUGAILCLI", + } + fake_user_datas.extend( + RougailUserDataEnvironment( + cmd_config, rougailconfig=fake_rougail_config + ).run() + ) if fake_user_datas: user_data = UserDatas(cmd_config).user_datas(fake_user_datas) if user_data["errors"]: raise Exception(user_data["errors"][0]) -# if user_data["warnings"]: -# raise Exception(user_data["warnings"][0]) + # if user_data["warnings"]: + # raise Exception(user_data["warnings"][0]) parser = TiramisuCmdlineParser( cmd_config, -# add_extra_options=False, + # add_extra_options=False, short_name_max_len=2, ) parser.parse_args(arguments) global print_traceback print_traceback = rougailconfig["cli.debug"] - cmd_config.property.setdefault(origin_prop, 'read_write', 'append') + cmd_config.property.setdefault(origin_prop, "read_write", "append") cmd_config.property.remove("not_for_commandline") cmd_config.property.read_only() - if rougailconfig['cli.versions']: + if rougailconfig["cli.versions"]: from tiramisu import __version__ - print(f'tiramisu: {__version__}') + + print(f"tiramisu: {__version__}") from tiramisu_cmdline_parser import __version__ - print(f'tiramisu-cmdline-parser: {__version__}') + + print(f"tiramisu-cmdline-parser: {__version__}") from rougail import __version__ - print(f'rougail: {__version__}') + + print(f"rougail: {__version__}") from . import __version__ - print(f'rougail-cli: {__version__}') - for step in ['structural', 'user_data', 'output']: - display_step = step.replace('_', '-') - for step_name in sorted(cmd_config.option(f'step.{step}').value.list()): + + print(f"rougail-cli: {__version__}") + for step in ["structural", "user_data", "output"]: + display_step = step.replace("_", "-") + for step_name in sorted(cmd_config.option(f"step.{step}").value.list()): path = ( Path(__file__).parent.parent / (step + "_" + step_name) @@ -98,8 +115,12 @@ def _main(arguments, do_not_print): ) if path.is_file(): try: - module = load_modules("rougail." + step + '_' + step_name, str(path)) - print(f'rougail-{display_step}-{step_name}: {module.__version__}') + module = load_modules( + "rougail." + step + "_" + step_name, str(path) + ) + print( + f"rougail-{display_step}-{step_name}: {module.__version__}" + ) except Exception as err: pass return @@ -130,7 +151,10 @@ def _main(arguments, do_not_print): _('cannot find "user_data" module "{0}"').format(user_data_name) ) module = load_modules("rougail.user_data_" + user_data_name, str(path)) - if hasattr(module.RougailUserData, 'force_apply_user_data') and module.RougailUserData.force_apply_user_data is True: + if ( + hasattr(module.RougailUserData, "force_apply_user_data") + and module.RougailUserData.force_apply_user_data is True + ): continue user_datas.extend( module.RougailUserData( @@ -151,7 +175,10 @@ def _main(arguments, do_not_print): / "__init__.py" ) module = load_modules("rougail.user_data_" + user_data_name, str(path)) - if hasattr(module.RougailUserData, 'force_apply_user_data') and module.RougailUserData.force_apply_user_data is True: + if ( + hasattr(module.RougailUserData, "force_apply_user_data") + and module.RougailUserData.force_apply_user_data is True + ): ret = module.RougailUserData( config, rougailconfig=rougailconfig, @@ -189,5 +216,6 @@ def main(arguments=None, do_not_print=False): except Exception as err: if print_traceback: import traceback + traceback.print_exc() exit(_("ERROR: {0}").format(err))