unrestraint
This commit is contained in:
parent
f1db5c87f6
commit
06027aad73
7 changed files with 58 additions and 25 deletions
|
@ -7,7 +7,11 @@ from argparse import RawDescriptionHelpFormatter
|
||||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||||
SymLinkOption, OptionDescription, Config
|
SymLinkOption, OptionDescription, Config
|
||||||
from tiramisu_api import Config as JsonConfig
|
try:
|
||||||
|
from tiramisu_api import Config as JsonConfig
|
||||||
|
params = ['tiramisu', 'tiramisu-json']
|
||||||
|
except:
|
||||||
|
params = ['tiramisu']
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,7 +35,7 @@ def get_config(json):
|
||||||
return jconfig
|
return jconfig
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
|
@pytest.fixture(params=params)
|
||||||
def json(request):
|
def json(request):
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,11 @@ import pytest
|
||||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||||
SymLinkOption, OptionDescription, Leadership, Config, submulti
|
SymLinkOption, OptionDescription, Leadership, Config, submulti
|
||||||
from tiramisu_api import Config as JsonConfig
|
try:
|
||||||
|
from tiramisu_api import Config as JsonConfig
|
||||||
|
params = ['tiramisu', 'tiramisu-json']
|
||||||
|
except:
|
||||||
|
params = ['tiramisu']
|
||||||
|
|
||||||
|
|
||||||
def get_config(json, with_mandatory=False):
|
def get_config(json, with_mandatory=False):
|
||||||
|
@ -31,7 +35,7 @@ def get_config(json, with_mandatory=False):
|
||||||
return jconfig
|
return jconfig
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['tiramisu', 'tiramisu-api'])
|
@pytest.fixture(params=params)
|
||||||
def json(request):
|
def json(request):
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,11 @@ import pytest
|
||||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||||
SymLinkOption, OptionDescription, Config
|
SymLinkOption, OptionDescription, Config
|
||||||
from tiramisu_api import Config as JsonConfig
|
try:
|
||||||
|
from tiramisu_api import Config as JsonConfig
|
||||||
|
params = ['tiramisu', 'tiramisu-json']
|
||||||
|
except:
|
||||||
|
params = ['tiramisu']
|
||||||
|
|
||||||
|
|
||||||
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False, empty_optiondescription=False):
|
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False, empty_optiondescription=False):
|
||||||
|
@ -59,7 +63,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
|
||||||
return jconfig
|
return jconfig
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
|
@pytest.fixture(params=params)
|
||||||
def json(request):
|
def json(request):
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,11 @@ import pytest
|
||||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||||
SymLinkOption, OptionDescription, Config
|
SymLinkOption, OptionDescription, Config
|
||||||
from tiramisu_api import Config as JsonConfig
|
try:
|
||||||
|
from tiramisu_api import Config as JsonConfig
|
||||||
|
params = ['tiramisu', 'tiramisu-json']
|
||||||
|
except:
|
||||||
|
params = ['tiramisu']
|
||||||
|
|
||||||
|
|
||||||
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
|
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
|
||||||
|
@ -67,7 +71,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
|
||||||
return jconfig
|
return jconfig
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
|
@pytest.fixture(params=params)
|
||||||
def json(request):
|
def json(request):
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
@ -461,7 +465,7 @@ prog.py: error: unrecognized arguments: --int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--int'])
|
parser.parse_args(['none', '--int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
@ -477,7 +481,7 @@ prog.py: error: unrecognized arguments: --int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--int'])
|
parser.parse_args(['none', '--int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
@ -493,7 +497,7 @@ prog.py: error: unrecognized arguments: --root.int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--root.int'])
|
parser.parse_args(['none', '--root.int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
@ -509,7 +513,7 @@ prog.py: error: unrecognized arguments: --root.int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--root.int'])
|
parser.parse_args(['none', '--root.int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
@ -525,7 +529,7 @@ prog.py: error: unrecognized arguments: --int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--int'])
|
parser.parse_args(['none', '--int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
@ -541,7 +545,7 @@ prog.py: error: unrecognized arguments: --int
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--int'])
|
parser.parse_args(['none', '--int', '1'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -6,10 +6,14 @@ from contextlib import redirect_stderr
|
||||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||||
SymLinkOption, OptionDescription, Config
|
SymLinkOption, OptionDescription, Config
|
||||||
from tiramisu_api import Config as JsonConfig
|
try:
|
||||||
|
from tiramisu_api import Config as JsonConfig
|
||||||
|
params = ['tiramisu', 'tiramisu-json']
|
||||||
|
except:
|
||||||
|
params = ['tiramisu']
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
|
@pytest.fixture(params=params)
|
||||||
def json(request):
|
def json(request):
|
||||||
return request.param
|
return request.param
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from .api import TiramisuCmdlineParser
|
from .api import TiramisuCmdlineParser
|
||||||
|
|
||||||
__version__ = "0.3"
|
__version__ = "0.4"
|
||||||
__all__ = ('TiramisuCmdlineParser',)
|
__all__ = ('TiramisuCmdlineParser',)
|
||||||
|
|
|
@ -122,7 +122,7 @@ class TiramisuNamespace(Namespace):
|
||||||
else:
|
else:
|
||||||
display_value = true_value
|
display_value = true_value
|
||||||
choices = get_choice_list(option, option.property.get(), False)
|
choices = get_choice_list(option, option.property.get(), False)
|
||||||
raise ValueError("argument {}: invalid choice: '{}' (choose from {})".format(self.arguments[key], display_value, ', '.join(["'{}'".format(val) for val in choices])))
|
raise ValueError("argument {}: invalid choice: '{}' (choose from {})".format(self.arguments[key], display_value, ', '.join([f"'{val}'" for val in choices])))
|
||||||
else:
|
else:
|
||||||
raise err
|
raise err
|
||||||
|
|
||||||
|
@ -135,7 +135,10 @@ class TiramisuNamespace(Namespace):
|
||||||
value is not None and \
|
value is not None and \
|
||||||
not isinstance(value, list):
|
not isinstance(value, list):
|
||||||
value = [value]
|
value = [value]
|
||||||
option.value.set(value)
|
try:
|
||||||
|
option.value.set(value)
|
||||||
|
except PropertiesOptionError:
|
||||||
|
raise AttributeError('unrecognized arguments: {}'.format(self.arguments[key]))
|
||||||
|
|
||||||
def _setattr_follower(self,
|
def _setattr_follower(self,
|
||||||
option: 'Option',
|
option: 'Option',
|
||||||
|
@ -275,21 +278,27 @@ class TiramisuCmdlineParser(ArgumentParser):
|
||||||
remove_empty_od: bool=False,
|
remove_empty_od: bool=False,
|
||||||
display_modified_value: bool=True,
|
display_modified_value: bool=True,
|
||||||
formatter_class=HelpFormatter,
|
formatter_class=HelpFormatter,
|
||||||
|
unrestraint: bool=False,
|
||||||
_forhelp: bool=False,
|
_forhelp: bool=False,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
self.fullpath = fullpath
|
self.fullpath = fullpath
|
||||||
self.config = config
|
self.config = config
|
||||||
self.root = root
|
self.root = root
|
||||||
self.remove_empty_od = remove_empty_od
|
self.remove_empty_od = remove_empty_od
|
||||||
|
self.unrestraint = unrestraint
|
||||||
self.display_modified_value = display_modified_value
|
self.display_modified_value = display_modified_value
|
||||||
if TiramisuHelpFormatter not in formatter_class.__mro__:
|
if TiramisuHelpFormatter not in formatter_class.__mro__:
|
||||||
formatter_class = type('TiramisuHelpFormatter', (TiramisuHelpFormatter, formatter_class), {})
|
formatter_class = type('TiramisuHelpFormatter', (TiramisuHelpFormatter, formatter_class), {})
|
||||||
formatter_class.remove_empty_od = self.remove_empty_od
|
formatter_class.remove_empty_od = self.remove_empty_od
|
||||||
kwargs['formatter_class'] = formatter_class
|
kwargs['formatter_class'] = formatter_class
|
||||||
if self.root is None:
|
if not _forhelp and self.unrestraint:
|
||||||
subconfig = self.config.option
|
subconfig = self.config.unrestraint
|
||||||
else:
|
else:
|
||||||
subconfig = self.config.option(self.root)
|
subconfig = self.config
|
||||||
|
if self.root is None:
|
||||||
|
subconfig = subconfig.option
|
||||||
|
else:
|
||||||
|
subconfig = subconfig.option(self.root)
|
||||||
self.namespace = TiramisuNamespace(self.config, self.root)
|
self.namespace = TiramisuNamespace(self.config, self.root)
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.register('action', 'help', _TiramisuHelpAction)
|
self.register('action', 'help', _TiramisuHelpAction)
|
||||||
|
@ -330,7 +339,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
||||||
def _parse_known_args(self, args=None, namespace=None):
|
def _parse_known_args(self, args=None, namespace=None):
|
||||||
try:
|
try:
|
||||||
namespace_, args_ = super()._parse_known_args(args, namespace)
|
namespace_, args_ = super()._parse_known_args(args, namespace)
|
||||||
except (ValueError, LeadershipError) as err:
|
except (ValueError, LeadershipError, AttributeError) as err:
|
||||||
self.error(err)
|
self.error(err)
|
||||||
if args != args_ and args_ and args_[0].startswith(self.prefix_chars):
|
if args != args_ and args_ and args_[0].startswith(self.prefix_chars):
|
||||||
# option that was disabled are no more disable
|
# option that was disabled are no more disable
|
||||||
|
@ -343,6 +352,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
||||||
formatter_class=self.formatter_class,
|
formatter_class=self.formatter_class,
|
||||||
epilog=self.epilog,
|
epilog=self.epilog,
|
||||||
description=self.description,
|
description=self.description,
|
||||||
|
unrestraint=self.unrestraint,
|
||||||
fullpath=self.fullpath)
|
fullpath=self.fullpath)
|
||||||
namespace_, args_ = new_parser._parse_known_args(args_, new_parser.namespace)
|
namespace_, args_ = new_parser._parse_known_args(args_, new_parser.namespace)
|
||||||
else:
|
else:
|
||||||
|
@ -444,8 +454,11 @@ class TiramisuCmdlineParser(ArgumentParser):
|
||||||
leadership_len = len(value)
|
leadership_len = len(value)
|
||||||
elif option.isfollower():
|
elif option.isfollower():
|
||||||
value = []
|
value = []
|
||||||
for index in range(leadership_len):
|
try:
|
||||||
value.append(self.config.option(obj.option.path(), index).value.get())
|
for index in range(leadership_len):
|
||||||
|
value.append(self.config.option(obj.option.path(), index).value.get())
|
||||||
|
except:
|
||||||
|
value = None
|
||||||
else:
|
else:
|
||||||
value = obj.value.get()
|
value = obj.value.get()
|
||||||
if self.fullpath and prefix:
|
if self.fullpath and prefix:
|
||||||
|
|
Loading…
Reference in a new issue