Skip to content
Snippets Groups Projects
Commit f18ed54e authored by Philippe O. Wagner's avatar Philippe O. Wagner
Browse files

Merge pull request #3 from bashu/master

added python 3 compatibility
parents 57c0c106 75a04c71
No related branches found
No related tags found
No related merge requests found
from compat import python_2_unicode_compatible from compat import python_2_unicode_compatible
from django.db import models
from django.db import models
from django.conf import settings from django.conf import settings
from django.core.files.uploadedfile import InMemoryUploadedFile
from PIL import Image from PIL import Image
import StringIO try:
from django.core.files.uploadedfile import InMemoryUploadedFile from StringIO import StringIO
except ImportError:
from io import StringIO
config = { config = {
'shortcut icon': [16, 32, 48, 128, 192], 'shortcut icon': [16, 32, 48, 128, 192],
...@@ -63,7 +66,7 @@ class Favicon(models.Model): ...@@ -63,7 +66,7 @@ class Favicon(models.Model):
tmp = Image.open(self.faviconImage.path) tmp = Image.open(self.faviconImage.path)
tmp.thumbnail((size, size), Image.ANTIALIAS) tmp.thumbnail((size, size), Image.ANTIALIAS)
tmpIO = StringIO.StringIO() tmpIO = StringIO()
tmp.save(tmpIO, format='PNG') tmp.save(tmpIO, format='PNG')
tmpFile = InMemoryUploadedFile( tmpFile = InMemoryUploadedFile(
tmpIO, None, 'fav-%s.png' % tmpIO, None, 'fav-%s.png' %
...@@ -103,7 +106,6 @@ class FaviconImg(models.Model): ...@@ -103,7 +106,6 @@ class FaviconImg(models.Model):
self.faviconImage.delete() self.faviconImage.delete()
from django.db.models import signals from django.db.models import signals
from django.db.models.signals import pre_delete from django.db.models.signals import pre_delete
from django.dispatch.dispatcher import receiver from django.dispatch.dispatcher import receiver
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment