From 4ebeb643da6419835e9ac3adb731e38a8ec9c7b4 Mon Sep 17 00:00:00 2001 From: Pepper Date: Sat, 26 Sep 2015 04:14:44 -0400 Subject: reworked some more --- lib/param/enum.py | 2 +- lib/param/json.py | 3 +-- lib/param/raw.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/param') diff --git a/lib/param/enum.py b/lib/param/enum.py index 067e0cd..49e11f6 100644 --- a/lib/param/enum.py +++ b/lib/param/enum.py @@ -3,6 +3,6 @@ import sys class Enum(Param): def __init__(self, value, enum_values=[], classname=""): super(Enum,self).__init__(classname=classname) - if value not in enum_values: + if value and value not in enum_values: return self.err_warn("Value %s not in enum values" % str(value)) self.value = value diff --git a/lib/param/json.py b/lib/param/json.py index 8d1a66e..af9b775 100644 --- a/lib/param/json.py +++ b/lib/param/json.py @@ -4,5 +4,4 @@ import simplejson as json class Json(Param): def __init__(self, value, classname=""): super(Json, self).__init__(classname=classname) - self.value = json.parse(value) - + self.value = json.loads(value) diff --git a/lib/param/raw.py b/lib/param/raw.py index 839f7e5..3d2f93f 100644 --- a/lib/param/raw.py +++ b/lib/param/raw.py @@ -3,4 +3,4 @@ from param import Param class Raw(Param): def __init__(self, value, classname=""): super(Raw, self).__init__(classname=classname) - self.value = value + self.value = value or None -- cgit v1.2.3-70-g09d2