Infra
/
tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix line wrapping and some raise messages spacing 

* tiramisu/option.py (Multi.append): do not wrapp short line.
  (validate_requires_arg): Add missing space for multi line strings.
This commit is contained in:
Daniel Dehennin 2013-01-31 17:01:10 +01:00
parent 03baedd4dd
commit 2cb3ddf2e8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tiramisu/option.py
View File

@ -91,8 +91,7 @@ class Multi(list):
if master == multi.opt._name: if master == multi.opt._name:
if add_master: if add_master:
multi._setvalue(value, who=settings.get_owner()) multi._setvalue(value, who=settings.get_owner())
elif len(multi) == 0 \ elif len(multi) == 0 or len(multi) < len(self):
or len(multi) < len(self):
multi._append_default() multi._append_default()
def _append_default(self): def _append_default(self):
@ -614,10 +613,10 @@ def validate_requires_arg(requires, name):
action = req[2] action = req[2]
if action not in available_actions: if action not in available_actions:
raise RequiresError("malformed requirements for option: {0}" raise RequiresError("malformed requirements for option: {0}"
"unknown action: {1}".format(name, action)) " unknown action: {1}".format(name, action))
if reverse_actions[action] in config_action: if reverse_actions[action] in config_action:
raise RequiresError("inconsistency in action types for option: {0}" raise RequiresError("inconsistency in action types for option: {0}"
"action: {1} in contradiction with {2}\n" " action: {1} in contradiction with {2}\n"
" ({3})".format(name, action, " ({3})".format(name, action,
reverse_actions[action], requires)) reverse_actions[action], requires))
config_action.append(action) config_action.append(action)