Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set proper content type and encode attachment name

Browse Source 
Fixes Bug #1098478
This commit is contained in:
Maciej Sitarz 2013-01-11 10:35:10 +01:00
parent 1110ec56ee
commit 9070090caa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/utils/smtp.py
View File

@ -37,16 +37,17 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
if attachment_data is not None: if attachment_data is not None:
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
from email.header import Header
assert attachment_data and attachment_name assert attachment_data and attachment_name
try: try:
maintype, subtype = attachment_type.split('/', 1) maintype, subtype = attachment_type.split('/', 1)
except AttributeError: except AttributeError:
maintype, subtype = 'application', 'octet-stream' maintype, subtype = 'application', 'octet-stream'
msg = MIMEBase(maintype, subtype) msg = MIMEBase(maintype, subtype, name=Header(attachment_name, 'utf-8').encode())
msg.set_payload(attachment_data) msg.set_payload(attachment_data)
encoders.encode_base64(msg) encoders.encode_base64(msg)
msg.add_header('Content-Disposition', 'attachment', msg.add_header('Content-Disposition', 'attachment',
filename=attachment_name) filename=Header(attachment_name, 'utf-8').encode())
outer.attach(msg) outer.attach(msg)
return outer.as_string() return outer.as_string()