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

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-06-11 11:28:10 -06:00
parent 72d9c3fa96
commit 7fccb95fc2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/email.py
View File

@ -11,8 +11,8 @@ from binascii import unhexlify
from functools import partial from functools import partial
from itertools import repeat from itertools import repeat
from calibre.utils.smtp import compose_mail, sendmail, extract_email_address, \ from calibre.utils.smtp import (compose_mail, sendmail, extract_email_address,
config as email_config config as email_config)
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.customize.ui import available_input_formats, available_output_formats from calibre.customize.ui import available_input_formats, available_output_formats
from calibre.ebooks.metadata import authors_to_string from calibre.ebooks.metadata import authors_to_string
@ -67,8 +67,8 @@ class Sendmail(object):
from_ = opts.from_ from_ = opts.from_
if not from_: if not from_:
from_ = 'calibre <calibre@'+socket.getfqdn()+'>' from_ = 'calibre <calibre@'+socket.getfqdn()+'>'
msg = compose_mail(from_, to, text, subject, open(attachment, 'rb'), with lopen(attachment, 'rb') as f:
aname) msg = compose_mail(from_, to, text, subject, f, aname)
efrom, eto = map(extract_email_address, (from_, to)) efrom, eto = map(extract_email_address, (from_, to))
eto = [eto] eto = [eto]
sendmail(msg, efrom, eto, localhost=None, sendmail(msg, efrom, eto, localhost=None,