X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/80fa50c87ed121896ddf1bdd993d5697bb5a56c3..4bee7bd524767dbe06de88b0c17632da324bcf8c:/models.py

diff --git a/models.py b/models.py
index dcb5d74..bf11cb5 100644
--- a/models.py
+++ b/models.py
@@ -11,10 +11,7 @@ from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
 from django.core.exceptions import ObjectDoesNotExist
-try:
-	import json
-except ImportError:
-	import simplejson as json
+from django.utils import simplejson as json
 from UserDict import DictMixin
 from templatetags.containers import ContainerNode
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
@@ -286,8 +283,7 @@ class File(Node):
 class Template(TreeModel):
 	name = models.CharField(max_length=255)
 	documentation = models.TextField(null=True, blank=True)
-	mimetype = models.CharField(max_length=255, null=True, blank=True,
-	    help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
+	mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
 	code = models.TextField(verbose_name='django template code')
 	
 	@property