From c4bb28325ae6e02fce0a38b881e16e8351185d97 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 13 Mar 2018 13:51:00 +0000 Subject: [PATCH] Feed back encoding information to the FileUploadForm when doing mime type validation, for later use in decoding. - Legacy-Id: 14777 --- ietf/meeting/forms.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py index 07482c2a1..f3abff79d 100644 --- a/ietf/meeting/forms.py +++ b/ietf/meeting/forms.py @@ -329,9 +329,11 @@ class FileUploadForm(forms.Form): file = self.cleaned_data['file'] validate_file_size(file) ext = validate_file_extension(file, self.extensions) - mime_type = None + mime_type, encoding = validate_mime_type(file, self.mime_types) + if not hasattr(self, 'file_encoding'): + self.file_encoding = {} + self.file_encoding[file.name] = encoding.replace('charset=','') if encoding else None if self.mime_types: - mime_type, encoding = validate_mime_type(file, self.mime_types) if mime_type != file.content_type: raise ValidationError('Upload Content-Type (%s) is different from the observed mime-type (%s)' % (file.content_type, mime_type)) if mime_type in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS: