diff options
Diffstat (limited to 'pyfirstaidkit')
-rw-r--r-- | pyfirstaidkit/plugins.py | 3 | ||||
-rw-r--r-- | pyfirstaidkit/reporting.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pyfirstaidkit/plugins.py b/pyfirstaidkit/plugins.py index 303cfc9..c0f1361 100644 --- a/pyfirstaidkit/plugins.py +++ b/pyfirstaidkit/plugins.py @@ -280,7 +280,8 @@ class Plugin(object): message = func+" raised "+str(e)) self._reporting.stop(level = TASK, origin = self, message = func) - pass + if self._interpret._config.system.debug: + raise return (self._state, self._result) diff --git a/pyfirstaidkit/reporting.py b/pyfirstaidkit/reporting.py index 9151db9..21a4b45 100644 --- a/pyfirstaidkit/reporting.py +++ b/pyfirstaidkit/reporting.py @@ -19,6 +19,7 @@ import Queue import logging import thread import weakref +import re from errors import * @@ -77,14 +78,16 @@ class Question(object): class ConfigQuestion(Question): """A question that allows list of configurable variables - Each item is a tuple (id, title, value, tooltip)""" + Each item is a tuple (id, title, value, + tooltip, regexp_validator, validator_error_msg)""" def __init__(self, title, description, items): super(ConfigQuestion, self).__init__(title) assert len(items) > 0 self.title = title self.description = description - self.items = items + self.items = map(lambda x: (x[0], x[1], x[2], x[3], + re.compile("^"+x[4]+"$"), x[5]), items) class ChoiceQuestion(Question): """A question that offers multiple options. |