From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 14 Jun 2010 02:52:16 +0000 (-0400)
Subject: Removing dependency on standalone simplejson by using the version included with Djang... 
X-Git-Tag: philo-0.9~81
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/4bee7bd524767dbe06de88b0c17632da324bcf8c

Removing dependency on standalone simplejson by using the version included with Django in django.utils.
---

diff --git a/README b/README
index 82333d6..4170400 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ Philo is a foundation for developing web content management systems.
 
 Prerequisites:
 	* Python 2.5.4+ <http://www.python.org/>
-	* simplejson <http://code.google.com/p/simplejson/> (Not required with Python 2.6+)
 	* Django 1.1.1+ <http://www.djangoproject.com/>
 	* (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
 
diff --git a/models.py b/models.py
index eb6ebc0..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