stove/rougail
3
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Wiki Activity

fix: add transition

Browse source
This commit is contained in:
egarette@silique.fr 2026-01-15 22:10:11 +01:00
parent 9a7d4ef803
commit 1ee82bede9
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rougail/convert/object_model.py
View file

@ -485,7 +485,7 @@ class JinjaCalculation(Calculation):
class _VariableCalculation(Calculation):
variable: StrictStr
propertyerror: bool = True
propertyerror: Union[Literal["transitive"], bool] = True
allow_none: bool = False
optional: bool = False

5
src/rougail/convert/tiramisureflector.py
View file

@ -372,8 +372,11 @@ class Common:
params.append("optional=True")
else:
param_type = "ParamOption"
if not param.get("propertyerror", True):
propertyerror = param.get("propertyerror", True)
if not propertyerror:
params.append("notraisepropertyerror=True")
elif propertyerror == "transitive":
params.append("raisepropertyerror=True")
return f'{param_type}({", ".join(params)})'
def calculation_value(

25
src/rougail/user_data.py
View file

@ -353,17 +353,32 @@ class UserData:
_("{0}, it has been loaded from {1}").format(err, options["source"]): option._subconfig}
)
continue
except AttributeOptionError as err:
if err.code == "option-not-found":
err_path = err.path
if "." not in err_path:
subconfig = None
child_name = err_path
else:
parent_path, child_name = err_path.rsplit('.', 1)
subconfig = self.config.option(parent_path)
subconfig._set_subconfig()
err_msg = _(
'variable or family "{0}" does not exist so cannot load "{1}'
).format(child_name, path)
if self.unknown_user_data_error:
msg = _(
'variable or family "{0}" does not exist, it has been loading from {1}'
'{0}, it has been loading from {1}'
)
else:
msg = _(
'variable or family "{0}" does not exist, it will be ignored when loading from {1}'
'{0}, it will be ignored when loading from {1}'
)
self.unknowns.append(msg.format(err.path, options["source"]))
msg = msg.format(err_msg, options["source"])
if subconfig is not None:
msg = {msg: subconfig._subconfig}
self.unknowns.append(msg)
elif err.code == "option-dynamic":
if self.invalid_user_data_error:
msg = _(
@ -373,9 +388,7 @@ class UserData:
msg = _(
'"{0}" is the name of a dynamic family, it will be ignored when loading from {1}'
)
self.invalids.append(
{msg.format(option.description(with_quote=True), options["source"]): option._subconfig}
)
self.invalids.append({msg.format(option.description(with_quote=True), options["source"]): option._subconfig})
else:
self.invalids.append(
_("{0} loaded from {1}").format(err, options["source"])