X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/24677328851cc04e6b15254606dfadd8af8a2432..dbfa7041eadc465c1aaddac3fca41624cbed852d:/validators.py

diff --git a/validators.py b/validators.py
index 5f69f74..8b39abd 100644
--- a/validators.py
+++ b/validators.py
@@ -1,12 +1,12 @@
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import RegexValidator
 from django.core.exceptions import ValidationError
-from django.template import Template, Parser, Lexer, TOKEN_BLOCK, TOKEN_VAR
+from django.template import Template, Parser, Lexer, TOKEN_BLOCK, TOKEN_VAR, TemplateSyntaxError
 from django.utils import simplejson as json
 import re
+from philo.utils import LOADED_TEMPLATE_ATTR
 
 
-LOADED_TEMPLATE_ATTR = '_philo_loaded_template'
 INSECURE_TAGS = (
 	'load',
 	'extends',
@@ -45,8 +45,8 @@ class URLLinkValidator(RegexValidator):
 def json_validator(value):
 	try:
 		json.loads(value)
-	except:
-		raise ValidationError(u'\'%s\' is not valid JSON' % value)
+	except Exception, e:
+		raise ValidationError(u'JSON decode error: %s' % e)
 
 
 class TemplateValidationParser(Parser):