X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..6b985a0a184c49324857d01b2f22fd23ebd5f5a4:/src/cover/forms.py?ds=sidebyside diff --git a/src/cover/forms.py b/src/cover/forms.py old mode 100755 new mode 100644 index 513bdefb..ea51e46b --- a/src/cover/forms.py +++ b/src/cover/forms.py @@ -1,15 +1,13 @@ -# -*- coding: utf-8 -*- -# # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from StringIO import StringIO +from io import BytesIO from django import forms from django.conf import settings from django.utils.translation import ugettext_lazy as _, ugettext from cover.models import Image -from django.utils.text import mark_safe +from django.utils.safestring import mark_safe from PIL import Image as PILImage from cover.utils import get_flickr_data, FlickrError, URLOpener @@ -18,6 +16,7 @@ from cover.utils import get_flickr_data, FlickrError, URLOpener class ImageAddForm(forms.ModelForm): class Meta: model = Image + exclude = [] def __init__(self, *args, **kwargs): super(ImageAddForm, self).__init__(*args, **kwargs) @@ -54,7 +53,7 @@ class ImageAddForm(forms.ModelForm): raise forms.ValidationError(ugettext('No image specified')) if download_url: image_data = URLOpener().open(download_url).read() - width, height = PILImage.open(StringIO(image_data)).size + width, height = PILImage.open(BytesIO(image_data)).size else: width, height = PILImage.open(uploaded_file.file).size min_width, min_height = settings.MIN_COVER_SIZE