diff --git a/tiramisu_cmdline_parser/api.py b/tiramisu_cmdline_parser/api.py index c63337a..e8b8cf2 100644 --- a/tiramisu_cmdline_parser/api.py +++ b/tiramisu_cmdline_parser/api.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 Team tiramisu (see AUTHORS for all contributors) +# Copyright (C) 2018-2025 Team tiramisu (see AUTHORS for all contributors) # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by the @@ -29,18 +29,6 @@ from gettext import gettext as _ from tiramisu import Config from tiramisu.error import PropertiesOptionError, LeadershipError, ConfigError -# except ImportError: -# Config = None -# from tiramisu_api.error import PropertiesOptionError -# LeadershipError = ValueError -try: - from tiramisu_api import Config as ConfigJson - - if Config is None: - Config = ConfigJson -except ImportError: - ConfigJson = Config - def get_choice_list(config, properties, display): def convert(choice): @@ -322,7 +310,7 @@ class _BuildKwargs: class TiramisuCmdlineParser(ArgumentParser): def __init__( self, - config: Union[Config, ConfigJson], + config: Config, *args, root: str = None, fullpath: bool = True, @@ -340,6 +328,8 @@ class TiramisuCmdlineParser(ArgumentParser): unrestraint = True self.fullpath = fullpath self.config = config + config_properties = config.property.get() + self.config_frozen = "frozen" in config_properties or "everything_frozen" in config_properties self.root = root self.remove_empty_od = remove_empty_od self.unrestraint = unrestraint @@ -462,7 +452,7 @@ class TiramisuCmdlineParser(ArgumentParser): obj = None for obj in config: # do not display frozen option - if "frozen" in obj.property.get(): + if self.config_frozen and "frozen" in obj.property.get(): continue if obj.isoptiondescription(): if _forhelp: