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

Prevent errors when testing email sending even if stderr on the host machine is broken

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-05 15:10:18 +05:30
parent 1fd67a34b0
commit b99fd3edc2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/wizard/send_email.py
View File

@ -13,6 +13,7 @@ from functools import partial
from PyQt5.Qt import QWidget, pyqtSignal, QDialog, Qt, QLabel, \ from PyQt5.Qt import QWidget, pyqtSignal, QDialog, Qt, QLabel, \
QLineEdit, QDialogButtonBox, QGridLayout, QCheckBox QLineEdit, QDialogButtonBox, QGridLayout, QCheckBox
from calibre import prints
from calibre.gui2.wizard.send_email_ui import Ui_Form from calibre.gui2.wizard.send_email_ui import Ui_Form
from calibre.utils.smtp import config as smtp_prefs from calibre.utils.smtp import config as smtp_prefs
from calibre.gui2.dialogs.test_email_ui import Ui_Dialog as TE_Dialog from calibre.gui2.dialogs.test_email_ui import Ui_Dialog as TE_Dialog
@ -159,6 +160,7 @@ class SendEmail(QWidget, Ui_Form):
opts = smtp_prefs().parse() opts = smtp_prefs().parse()
from calibre.utils.smtp import sendmail, create_mail from calibre.utils.smtp import sendmail, create_mail
buf = cStringIO.StringIO() buf = cStringIO.StringIO()
debug_out = partial(prints, file=buf)
oout, oerr = sys.stdout, sys.stderr oout, oerr = sys.stdout, sys.stderr
sys.stdout = sys.stderr = buf sys.stdout = sys.stderr = buf
tb = None tb = None
@ -167,7 +169,7 @@ class SendEmail(QWidget, Ui_Form):
'Test mail from calibre') 'Test mail from calibre')
sendmail(msg, from_=opts.from_, to=[to], sendmail(msg, from_=opts.from_, to=[to],
verbose=3, timeout=30, relay=opts.relay_host, verbose=3, timeout=30, relay=opts.relay_host,
username=opts.relay_username, username=opts.relay_username, debug_output=debug_out,
password=unhexlify(opts.relay_password).decode('utf-8'), password=unhexlify(opts.relay_password).decode('utf-8'),
encryption=opts.encryption, port=opts.relay_port) encryption=opts.encryption, port=opts.relay_port)
except: except: