X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/818e3f52a72658d6b7ec5c1ce74fac9a6d21b0f3..d4e6b90b55aff9b98a67615c64fce5089a82f947:/models.py diff --git a/models.py b/models.py index eb6ebc0..ecd1c1f 100644 --- a/models.py +++ b/models.py @@ -5,18 +5,15 @@ from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType from django.db import models from django.contrib.sites.models import Site -from utils import fattr +from philo.utils import fattr from django.template import add_to_builtins as register_templatetags 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 philo.templatetags.containers import ContainerNode from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode from django.template.loader import get_template from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect