From 82859785ca4ec31e7858e5bbeb9a8606ff614f43 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Fri, 1 Jul 2011 13:33:55 -0700 Subject: [PATCH 1/2] Clean up whitespace. --- pyes/scriptfields.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 pyes/scriptfields.py diff --git a/pyes/scriptfields.py b/pyes/scriptfields.py old mode 100644 new mode 100755 index 20d7ee0b..60b44d09 --- a/pyes/scriptfields.py +++ b/pyes/scriptfields.py @@ -11,7 +11,7 @@ class ScriptFields(object): def __init__(self, field_name, script, params = None): self.fields={} self.add_field(field_name, script, params or {}) - + def add_field(self, field_name, script, params = None): """ Add a field to script_fields @@ -26,22 +26,22 @@ def add_field(self, field_name, script, params = None): if len(params): data['params'] = params else: - raise ScriptFieldsError("Parameters should be a valid dictionary") - + raise ScriptFieldsError("Parameters should be a valid dictionary") + self.fields[field_name] = data - + def add_parameter(self, field_name, param_name, param_value): """ Add a parameter to a field into script_fields - + The ScriptFields object will be returned, so calls to this can be chained. """ try: self.fields[field_name]['params'][param_name] = param_value except Exception as ex: raise ScriptFieldsError("Error adding parameter %s with value %s :%s" % (param_name,param_value,ex)) - + return self - def serialize(self): + def serialize(self): return self.fields From 9fb1fbc8bb6658e69adf44b6309f93689e0420fb Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Fri, 1 Jul 2011 13:42:15 -0700 Subject: [PATCH 2/2] Fix missing ScriptFieldsError in scriptfields.py, add test. --- pyes/scriptfields.py | 2 ++ pyes/tests/test_scriptfields.py | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pyes/tests/test_scriptfields.py diff --git a/pyes/scriptfields.py b/pyes/scriptfields.py index 60b44d09..8c3237d4 100755 --- a/pyes/scriptfields.py +++ b/pyes/scriptfields.py @@ -3,6 +3,8 @@ __author__ = 'Armando Guereca' +from pyes.exceptions import ScriptFieldsError + class ScriptFields(object): """ This object create the script_fields definition diff --git a/pyes/tests/test_scriptfields.py b/pyes/tests/test_scriptfields.py new file mode 100644 index 00000000..ab610a42 --- /dev/null +++ b/pyes/tests/test_scriptfields.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# +# Author: Ian Eure +# + +import unittest + +import pyes.exceptions as exc +import pyes.scriptfields as sf + +class ScriptFieldsTest(unittest.TestCase): + + def test_scriptfieldserror_imported(self): + self.assertTrue(hasattr(sf, 'ScriptFieldsError')) + + +if __name__ == '__main__': + unittest.main()