extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 08:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Attachement should be readed in binary mode ... and attached as payload (regarding docs)

Browse Source
This commit is contained in:
Pawel M
2016-12-13 22:39:28 +01:00
parent 8bbe3d2e55
commit e7c4131ed7
3 changed files with 439 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
helpdesk/lib.py
View File

@ -21,7 +21,6 @@ except ImportError:
from django.conf import settings
from django.db.models import Q
from django.utils import six
from django.utils.encoding import smart_text
from django.utils.safestring import mark_safe
@ -121,12 +120,9 @@ def send_templated_mail(template_name,
msg.attach_alternative(html_part, "text/html")
if files:
for filename, filefield in files:
if six.PY3:
msg.attach_file(filefield.path)
else:
with open(filefield.path) as attachedfile:
msg.attach(filename, attachedfile.read())
for file_name, file_field in files:
with open(file_field.path, 'rb') as attached_file:
msg.attach(file_name, attached_file.read(), getattr(attached_file, 'content_type', None))
return msg.send(fail_silently)