summaryrefslogtreecommitdiff
path: root/app/photos
diff options
context:
space:
mode:
Diffstat (limited to 'app/photos')
-rw-r--r--app/photos/models.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/photos/models.py b/app/photos/models.py
index e64e186..7daae94 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -1,10 +1,10 @@
import datetime
-import Image
+from PIL import Image
import os.path
from django.contrib.gis.db import models
from django.contrib.sitemaps import Sitemap
from django.contrib.syndication.views import Feed
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_text
from django.conf import settings
@@ -48,7 +48,7 @@ class Photo(models.Model):
def admin_thumbnail(self):
- return force_unicode('<a href="%s"><img src="%s"></a>' % \
+ return force_text('<a href="%s"><img src="%s"></a>' % \
(self.get_absolute_url(), self.get_small_square_url()))
admin_thumbnail.allow_tags = True
admin_thumbnail.short_description = 'Thumbnail'