Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support django 1.7 on python 3.4.3 #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 19 additions & 10 deletions awesome_avatar/fields.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import os
import uuid
from awesome_avatar.settings import config
from django.core.files.uploadedfile import InMemoryUploadedFile
from django.db import models
from awesome_avatar import forms
from awesome_avatar.widgets import AvatarWidget

try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
try:
from StringIO import StringIO
except ImportError: # python 3
from io import BytesIO as StringIO

try:
from PIL import Image
Expand All @@ -32,26 +37,30 @@ def __init__(self, *args, **kwargs):
super(AvatarField, self).__init__(*args, **kwargs)

def formfield(self, **kwargs):
defaults = {'form_class': forms.AvatarField}
defaults['width'] = self.width
defaults['height'] = self.height
defaults = {
'form_class': forms.AvatarField,
'width': self.width,
'height': self.height,
}
defaults.update(kwargs)

# django 1.7 fix default widget
if not defaults.get('widget') or not isinstance(defaults.get('widget'), AvatarWidget):
defaults['widget'] = AvatarWidget
return super(AvatarField, self).formfield(**defaults)

def save_form_data(self, instance, data):
# if data and self.width and self.height:
file_ = data['file']
if file_:

image = Image.open(StringIO(file_.read()))
image = Image.open(file_)
image = image.crop(data['box'])
image = image.resize((self.width, self.height), Image.ANTIALIAS)

content = StringIO()
image.save(content, config.save_format, quality=config.save_quality)
file_name = u'{}.{}'.format(str(uuid.uuid1()), config.save_format)
new_data = InMemoryUploadedFile(StringIO(), None, file_name, 'image/' + config.save_format, 0, None)

file_name = u'{}.{}'.format(os.path.splitext(file_.name)[0], config.save_format)
image.save(new_data, config.save_format, quality=config.save_quality)

# new_data = SimpleUploadedFile(file.name, content.getvalue(), content_type='image/' + config.save_format)
new_data = InMemoryUploadedFile(content, None, file_name, 'image/' + config.save_format, len(content.getvalue()), None)
super(AvatarField, self).save_form_data(instance, new_data)
2 changes: 1 addition & 1 deletion awesome_avatar/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ def to_python(self, data):
return data

def widget_attrs(self, widget):
return {'width': self.width, 'height': self.height}
return {'width': self.width, 'height': self.height}