Compare commits

..

No commits in common. "db2402b04a1d6b33908e0af6d8f6d518d0b8844a" and "03f84ef27ef21e8dda53ff8e9e0e591a8ee1814a" have entirely different histories.

5 changed files with 13 additions and 39 deletions

View file

@ -1,9 +1,3 @@
## 0.7.0a1 (2025-05-12)
### Fix
- black
## 0.7.0a0 (2025-04-30) ## 0.7.0a0 (2025-04-30)
### Feat ### Feat

View file

@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
[project] [project]
name = "tiramisu_cmdline_parser" name = "tiramisu_cmdline_parser"
version = "0.7.0a1" version = "0.7.0a0"
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}] authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
readme = "README.md" readme = "README.md"
description = "command-line parser using Tiramisu" description = "command-line parser using Tiramisu"

View file

@ -23,5 +23,4 @@ except ImportError as err:
TiramisuCmdlineParser = None TiramisuCmdlineParser = None
from .__version__ import __version__ from .__version__ import __version__
__all__ = ("TiramisuCmdlineParser",) __all__ = ("TiramisuCmdlineParser",)

View file

@ -1 +1,2 @@
__version__ = "0.7.0a1" __version__ = "0.7.0a0"

View file

@ -255,26 +255,16 @@ class _BuildKwargs:
name, "longargument" in self.properties name, "longargument" in self.properties
) )
if self.force_no: if self.force_no:
ga_name = gen_argument_name( ga_name = gen_argument_name(name, is_short_name, self.force_no, self.force_del)
name, is_short_name, self.force_no, self.force_del ga_path = gen_argument_name(option.path(), is_short_name, self.force_no, self.force_del)
)
ga_path = gen_argument_name(
option.path(), is_short_name, self.force_no, self.force_del
)
self.cmdlineparser.namespace.list_force_no[ga_path] = option.path() self.cmdlineparser.namespace.list_force_no[ga_path] = option.path()
elif self.force_del: elif self.force_del:
ga_name = gen_argument_name( ga_name = gen_argument_name(name, is_short_name, self.force_no, self.force_del)
name, is_short_name, self.force_no, self.force_del ga_path = gen_argument_name(option.path(), is_short_name, self.force_no, self.force_del)
)
ga_path = gen_argument_name(
option.path(), is_short_name, self.force_no, self.force_del
)
self.cmdlineparser.namespace.list_force_del[ga_path] = option.path() self.cmdlineparser.namespace.list_force_del[ga_path] = option.path()
else: else:
ga_name = name ga_name = name
self.kwargs["dest"] = gen_argument_name( self.kwargs["dest"] = gen_argument_name(option.path(), False, self.force_no, self.force_del)
option.path(), False, self.force_no, self.force_del
)
argument = self.cmdlineparser._gen_argument(ga_name, is_short_name) argument = self.cmdlineparser._gen_argument(ga_name, is_short_name)
self.cmdlineparser.namespace.arguments[option.path()] = argument self.cmdlineparser.namespace.arguments[option.path()] = argument
self.args = [argument] self.args = [argument]
@ -292,13 +282,9 @@ class _BuildKwargs:
option.name(), "longargument" in self.properties option.name(), "longargument" in self.properties
) )
if self.force_no: if self.force_no:
name = gen_argument_name( name = gen_argument_name(option.name(), is_short_name, self.force_no, self.force_del)
option.name(), is_short_name, self.force_no, self.force_del
)
elif self.force_del: elif self.force_del:
name = gen_argument_name( name = gen_argument_name(option.name(), is_short_name, self.force_no, self.force_del)
option.name(), is_short_name, self.force_no, self.force_del
)
else: else:
name = option.name() name = option.name()
argument = self.cmdlineparser._gen_argument(name, is_short_name) argument = self.cmdlineparser._gen_argument(name, is_short_name)
@ -467,7 +453,7 @@ class TiramisuCmdlineParser(ArgumentParser):
elif ( elif (
self.add_extra_options self.add_extra_options
and obj.type() == "boolean" and obj.type() == "boolean"
# and not obj.issymlinkoption() # and not obj.issymlinkoption()
): ):
if not obj.isleader(): if not obj.isleader():
yield obj, False, None yield obj, False, None
@ -492,11 +478,7 @@ class TiramisuCmdlineParser(ArgumentParser):
# no follower found, search if there is a symlink # no follower found, search if there is a symlink
for sobj in config.list(uncalculated=True): for sobj in config.list(uncalculated=True):
try: try:
if ( if sobj.issymlinkoption() and sobj.index() is None and sobj.option().isleader():
sobj.issymlinkoption()
and sobj.index() is None
and sobj.option().isleader()
):
yield sobj, None, None yield sobj, None, None
except ConfigError: except ConfigError:
pass pass
@ -523,9 +505,7 @@ class TiramisuCmdlineParser(ArgumentParser):
else: else:
argument_name = option.option().name() argument_name = option.option().name()
is_short_name = len(option.option().name()) == 1 is_short_name = len(option.option().name()) == 1
symlink_name = gen_argument_name( symlink_name = gen_argument_name(argument_name, is_short_name, force_no, force_del)
argument_name, is_short_name, force_no, force_del
)
if symlink_name in options_is_not_default: if symlink_name in options_is_not_default:
options_is_not_default[symlink_name]["name"] = name options_is_not_default[symlink_name]["name"] = name
if symlink_name in actions: if symlink_name in actions: