( )⚙ D4218 mail: fix debug print, which appears to have been broken for a long time

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4218

mail: fix debug print, which appears to have been broken for a long time
ClosedPublic

Authored by durin42 on Aug 9 2018, 6:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG713126389ef2: mail: fix debug print, which appears to have been broken for a long time
Summary

I noticed this when trying to debug very mysterious dummysmtpd
problems. It turns out you can set self.debuglevel to a number greater
than 0 and have smtplib print helpful debug output, but this output on
our side of things was broken.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (2 lines)

Diff 10212

mercurial/mail.py

self.certfile = certfile self.certfile = certfile
smtplib.SMTP.__init__(self, **kwargs) smtplib.SMTP.__init__(self, **kwargs)
self._host = host self._host = host
self.default_port = smtplib.SMTP_SSL_PORT self.default_port = smtplib.SMTP_SSL_PORT
self._ui = ui self._ui = ui
def _get_socket(self, host, port, timeout): def _get_socket(self, host, port, timeout):
if self.debuglevel > 0: if self.debuglevel > 0:
self._ui.debug('connect: %r\n' % (host, port)) self._ui.debug('connect: %r\n' % ((host, port),))
new_socket = socket.create_connection((host, port), timeout) new_socket = socket.create_connection((host, port), timeout)
new_socket = sslutil.wrapsocket(new_socket, new_socket = sslutil.wrapsocket(new_socket,
self.keyfile, self.certfile, self.keyfile, self.certfile,
ui=self._ui, ui=self._ui,
serverhostname=self._host) serverhostname=self._host)
self.file = new_socket.makefile(r'rb') self.file = new_socket.makefile(r'rb')
return new_socket return new_socket