From 480896bd416d0dfef7716508c6a10144d0fa068e Mon Sep 17 00:00:00 2001 From: Pepper Date: Sun, 27 Sep 2015 03:02:22 -0400 Subject: ready for merge and ready for publish --- lib/params.py | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'lib/params.py') diff --git a/lib/params.py b/lib/params.py index 2f3bf31..04677c0 100644 --- a/lib/params.py +++ b/lib/params.py @@ -44,31 +44,28 @@ class Params(object): to attribute values of the params class""" value = None for key in def_dict.keys(): - try: - value = None - if key in classkwargs: - value = classkwargs.get(key, None) or def_dict[key].get('default', None) - elif 'default' in def_dict[key]: - value = def_dict[key]['default'] - if def_dict[key]['type'] == "bool": - instance = Bool(value, classname=classname) - elif def_dict[key]['type'] == "color": - instance = Color(value, classname=classname) - elif def_dict[key]['type'] == "enum": - instance = Enum(value, enum_values=def_dict[key]['enum_values'], classname=classname) - elif def_dict[key]['type'] == "float": - instance = Float(value, classname=classname) - elif def_dict[key]['type'] == "img_url": - instance = Img_url(value, key=key, classname=classname) - elif def_dict[key]['type'] == "int": - instance = Int(value, classname=classname) - elif def_dict[key]['type'] == "json": - instance = Json(value, classname=classname) - elif def_dict[key]['type'] == "raw": - instance = Raw(value, classname=classname) - elif def_dict[key]['type'] == "string": - instance = String(value, classname=classname) - self.__setattr__(key, instance) - except Exception as e: - self.err_warn("key: %s value: %s" % (key, str(def_dict[key])), error=str(e)) + value = None + if key in classkwargs: + value = classkwargs.get(key, None) or def_dict[key].get('default', None) + elif 'default' in def_dict[key]: + value = def_dict[key]['default'] + if def_dict[key]['type'] == "bool": + instance = Bool(value, classname=classname) + elif def_dict[key]['type'] == "color": + instance = Color(value, classname=classname) + elif def_dict[key]['type'] == "enum": + instance = Enum(value, enum_values=def_dict[key]['enum_values'], classname=classname) + elif def_dict[key]['type'] == "float": + instance = Float(value, classname=classname) + elif def_dict[key]['type'] == "img_url": + instance = Img_url(value, key=key, classname=classname) + elif def_dict[key]['type'] == "int": + instance = Int(value, classname=classname) + elif def_dict[key]['type'] == "json": + instance = Json(value, classname=classname) + elif def_dict[key]['type'] == "raw": + instance = Raw(value, classname=classname) + elif def_dict[key]['type'] == "string": + instance = String(value, classname=classname) + self.__setattr__(key, instance) -- cgit v1.2.3-70-g09d2