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.

Download Raw Diff

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

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 9 2018, 6:06 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 9 2018, 6:06 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D4219: dummysmtpd: accept additional kwargs from stdlib smtpd.Aug 9 2018, 6:06 PM

Closed by commit rHG713126389ef2: mail: fix debug print, which appears to have been broken for a long time (authored by durin42). · Explain WhyAug 9 2018, 11:03 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/mail.py (2 lines)

Status	Author	Revision
Closed	durin42	D4234 tests: allow for a bonus newline in base64'd email payload
Closed	durin42	D4233 mail: be more cautious about bytes vs str for py3 compat
Closed	durin42	D4232 patchbomb: use native strings when determining attachment disposition
Closed	durin42	D4231 mail: always fall back to iso-8859-1 if us-ascii won't work (BC)
Closed	durin42	D4230 tests: put some Python 3 polish on inline Python invocations
Closed	durin42	D4229 patchbomb: don't unintentionally duplicate headers
Closed	durin42	D4228 patchbomb: use sysstrs when describing content-type
Closed	durin42	D4223 patchbomb: use native strs for email header keys and values
Closed	durin42	D4222 patchbomb: use email.encoders instead of email.Encoders
Closed	durin42	D4221 mail: properly handle email addresses typically being unicodes
Closed	durin42	D4220 tests: fix Python3 issues in Python one-liners in test-patchbomb.t
Closed	durin42	D4219 dummysmtpd: accept additional kwargs from stdlib smtpd
Closed	durin42	D4218 mail: fix debug print, which appears to have been broken for a long time
Closed	durin42	D3957 patchbomb: python 3 really wants those email addresses in unicode
Closed	durin42	D3956 mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
Closed	durin42	D3955 mail: modernize check for Python-with-TLS
Closed	durin42	D3954 mail: cope with Py3 unicode antics on email addresses
Closed	durin42	D3953 mail: fix _encode to be more correct on Python 3
Closed	durin42	D3951 patchbomb: work around email module really wanting to write unicode data

Diff 10250

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10212		Aug 9 2018, 6:06 PM	★	★
Diff 2	10250	rHG713126389ef230ad8d4149da5d2af021b9688d38	Aug 9 2018, 5:44 PM	★	★