X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/7ea527579abe3945bc5c17063fb94387a3cc981f..49c97b01f25be1831eedf7c615849bcb08142ea5:/models.py?ds=sidebyside

diff --git a/models.py b/models.py
index c62d7eb..26de321 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
@@ -293,6 +290,9 @@ class File(Node):
 		response = HttpResponse(wrapper, content_type=self.mimetype)
 		response['Content-Length'] = self.file.size
 		return response
+	
+	def __unicode__(self):
+		return self.file
 
 
 class Template(TreeModel):