This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4233

mail: be more cautious about bytes vs str for py3 compat
ClosedPublic

Authored by durin42 on Aug 9 2018, 10:07 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG952bf3c948f0: mail: be more cautious about bytes vs str for py3 compat

Summary

It's suboptimal that we get a bytes on 2 and a unicode on 3, but it's
easy to work with and I'm disinclined to change anything unless we
start using some sort of type inferencer.

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, 10:07 PM

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

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

durin42 added a child revision: D4234: tests: allow for a bonus newline in base64'd email payload.Aug 9 2018, 10:07 PM

Closed by commit rHG952bf3c948f0: mail: be more cautious about bytes vs str for py3 compat (authored by durin42). · Explain WhyAug 9 2018, 11:30 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/mail.py (4 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 10265

mercurial/mail.py

	return str(email.header.Header(s, cs))			return str(email.header.Header(s, cs))
	return s			return s

	def _addressencode(ui, name, addr, charsets=None):			def _addressencode(ui, name, addr, charsets=None):
	name = headencode(ui, name, charsets)			name = headencode(ui, name, charsets)
	try:			try:
	acc, dom = addr.split(r'@')			acc, dom = addr.split(r'@')
	acc = acc.encode('ascii')			acc = acc.encode('ascii')
	dom = dom.decode(encoding.encoding).encode('idna')			if isinstance(dom, bytes):
				dom = dom.decode(encoding.encoding)
				dom = dom.encode('idna')
	addr = '%s@%s' % (acc, dom)			addr = '%s@%s' % (acc, dom)
	except UnicodeDecodeError:			except UnicodeDecodeError:
	raise error.Abort(_('invalid email address: %s') % addr)			raise error.Abort(_('invalid email address: %s') % addr)
	except ValueError:			except ValueError:
	try:			try:
	# too strict?			# too strict?
	addr = addr.encode('ascii')			addr = addr.encode('ascii')
	except UnicodeDecodeError:			except UnicodeDecodeError:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10227		Aug 9 2018, 10:07 PM	★	★
Diff 2	10265	rHG952bf3c948f0e4ec7ba5a2a7a1c441db3166f5d9	Aug 9 2018, 9:58 PM	★	★