From 2d59e86ab985f1c83a95432a0035159230bcdc7f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 23 Jul 2013 01:05:09 -0500 Subject: [PATCH] removed e, no None in IS_JSON --- VERSION | 2 +- gluon/validators.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index f8a2f479..e1bfa671 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.22.14.51.29 +Version 2.6.0-development+timestamp.2013.07.23.01.03.38 diff --git a/gluon/validators.py b/gluon/validators.py index 21d94a2f..7b4294f1 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -351,14 +351,12 @@ class IS_JSON(Validator): self.error_message = error_message def __call__(self, value): - if value is None: - return None try: if self.native_json: simplejson.loads(value) # raises error in case of malformed json return (value, None) # the serialized value is not passed return (simplejson.loads(value), None) - except JSONErrors, e: + except JSONErrors: return (value, translate(self.error_message)) def formatter(self,value):