holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-27 02:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/corrupt-forwarding-of-binary-attachments' of https://github.com/reduxionist/django-helpdesk

Browse Source
This commit is contained in:
Pawel M 2016-12-13 19:53:51 +01:00
commit 8bbe3d2e55
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/lib.py
View File

@ -21,6 +21,7 @@ except ImportError:
from django.conf import settings from django.conf import settings
from django.db.models import Q from django.db.models import Q
from django.utils import six
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
@ -121,7 +122,11 @@ def send_templated_mail(template_name,
if files: if files:
for filename, filefield in files: for filename, filefield in files:
msg.attach(filename, open(filefield.path).read()) if six.PY3:
msg.attach_file(filefield.path)
else:
with open(filefield.path) as attachedfile:
msg.attach(filename, attachedfile.read())
return msg.send(fail_silently) return msg.send(fail_silently)