From 2cb3ddf2e8a138d96ca371b26740c86d7c34ac92 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Thu, 31 Jan 2013 17:01:10 +0100 Subject: [PATCH] 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. --- tiramisu/option.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tiramisu/option.py b/tiramisu/option.py index 79ef025..41ab171 100644 --- a/tiramisu/option.py +++ b/tiramisu/option.py @@ -91,8 +91,7 @@ class Multi(list): if master == multi.opt._name: if add_master: multi._setvalue(value, who=settings.get_owner()) - elif len(multi) == 0 \ - or len(multi) < len(self): + elif len(multi) == 0 or len(multi) < len(self): multi._append_default() def _append_default(self): @@ -614,10 +613,10 @@ def validate_requires_arg(requires, name): action = req[2] if action not in available_actions: 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: 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, reverse_actions[action], requires)) config_action.append(action)