This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3957

patchbomb: python 3 really wants those email addresses in unicode
ClosedPublic

Authored by durin42 on Jul 16 2018, 7:16 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG8919cc4f63b4: patchbomb: python 3 really wants those email addresses in unicode

Summary

At this point, test-patchbomb-tls.t almost passes on Python 3, but I'm
not really sure what the issue is: we just get a `abort: Connection
unexpectedly closed` that doesn't make sense to me.

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.Jul 16 2018, 7:16 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 16 2018, 7:16 PM

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

sendmail(sender_addr, to + bcc + cc, fp.getvalue())

+ alldests = to + bcc + cc
+ alldests = [pycompat.strurl(d) for d in alldests]
+ sendmail(sender_addr, alldests, fp.getvalue())

encoding.strfromlocal() to avoid unicode exception.

durin42 updated this revision to Diff 10193.Aug 9 2018, 4:43 PM

durin42 added a child revision: D4203: dummysmtpd: also put log messages in a file.Aug 9 2018, 4:48 PM

durin42 added a child revision: D4218: mail: fix debug print, which appears to have been broken for a long time.Aug 9 2018, 6:06 PM

durin42 removed a child revision: D4203: dummysmtpd: also put log messages in a file.Aug 9 2018, 10:08 PM

Closed by commit rHG8919cc4f63b4: patchbomb: python 3 really wants those email addresses in unicode (authored by durin42). · Explain WhyAug 9 2018, 11:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/patchbomb.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9613		Jul 16 2018, 7:16 PM	★	★
Diff 2	10193		Aug 9 2018, 4:43 PM	★	★
Diff 3	10249	rHG8919cc4f63b4dd6ef4469f352e080bbea612fc1b	Jul 16 2018, 6:17 PM	★	★

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 10249

hgext/patchbomb.py

	progress.update(i, item=subj)			progress.update(i, item=subj)
	if not mbox:			if not mbox:
	# Exim does not remove the Bcc field			# Exim does not remove the Bcc field
	del m['Bcc']			del m['Bcc']
	fp = stringio()			fp = stringio()
	generator = emailgen.Generator(_bytesgenerator(fp),			generator = emailgen.Generator(_bytesgenerator(fp),
	mangle_from_=False)			mangle_from_=False)
	generator.flatten(m, 0)			generator.flatten(m, 0)
	sendmail(sender_addr, to + bcc + cc, fp.getvalue())			alldests = to + bcc + cc
				alldests = [encoding.strfromlocal(d) for d in alldests]
				sendmail(sender_addr, alldests, fp.getvalue())

	progress.complete()			progress.complete()