fixed IS_JSON, thanks Alan

This commit is contained in:
mdipierro committed 2013-01-21 16:42:42 -06:00
1 parent d15f13dcbd
commit a443631f11
2 files changed
+9 -4

No files matched your search

+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.21.14.12.24 Version 2.4.1-alpha.2+timestamp.2013.01.21.16.42.00
+8 -3
View File
@@ -328,13 +328,18 @@ class IS_JSON(Validator):
self.error_message = error_message self.error_message = error_message
def __call__(self, value): def __call__(self, value):
if value is None:
return None
try: try:
simplejson.loads(value) return (simplejson.loads(value), None)
return (value, None)
except JSONErrors: except JSONErrors:
pass
return (value, translate(self.error_message)) return (value, translate(self.error_message))
def formatter(self,value):
if value is None:
return None
return simplejson.dumps(value)
class IS_IN_SET(Validator): class IS_IN_SET(Validator):
""" """