diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-15 21:02:51 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-15 21:09:19 +0200 |
| commit | 8cfc8b3408916ccb156fc25102bc1d9346bc004b (patch) | |
| tree | 5c38adfedca3f4f4073d0621840ea578dd67ed4d /grc/core/Element.py | |
| parent | 036264ef5c8e2376acd426a99ca42d29390e3e2a (diff) | |
| parent | bdf85171b8a35004cdbf634f48ff696787b5fbde (diff) | |
Merge remote-tracking branch 'upstream/master' into refactoring
Diffstat (limited to 'grc/core/Element.py')
| -rw-r--r-- | grc/core/Element.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/grc/core/Element.py b/grc/core/Element.py index c999d6704f..b96edb0a72 100644 --- a/grc/core/Element.py +++ b/grc/core/Element.py @@ -41,9 +41,9 @@ class Element(object): Is this element valid? Returns: - true when the element is enabled and has no error messages + true when the element is enabled and has no error messages or is bypassed """ - return not self.get_error_messages() or not self.get_enabled() + return (not self.get_error_messages() or not self.get_enabled()) or self.get_bypassed() def add_error_message(self, msg): """ @@ -57,14 +57,14 @@ class Element(object): def get_error_messages(self): """ Get the list of error messages from this element and all of its children. - Do not include the error messages from disabled children. + Do not include the error messages from disabled or bypassed children. Cleverly indent the children error messages for printing purposes. Returns: a list of error message strings """ error_messages = list(self._error_messages) # Make a copy - for child in filter(lambda c: c.get_enabled(), self.get_children()): + for child in filter(lambda c: c.get_enabled() and not c.get_bypassed(), self.get_children()): for msg in child.get_error_messages(): error_messages.append("{}:\n\t{}".format(child, msg.replace("\n", "\n\t"))) return error_messages @@ -80,6 +80,9 @@ class Element(object): def get_enabled(self): return True + def get_bypassed(self): + return False + ############################################## # Tree-like API ############################################## |