This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3952

patchbomb: ensure all headers and values given to email mod are native strings
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG65ed2fcb9032: patchbomb: ensure all headers and values given to email mod are native strings
Summary

This lets test-patch-bookmark.t only fail with some harmless header
output changes on Python 3, so I think patchbomb might be basically
useful on Python 3 now.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/patchbomb.py (10 lines)

Diff 9714

hgext/patchbomb.py

m['From'] = sender m['From'] = sender
m['To'] = ', '.join(to) m['To'] = ', '.join(to)
if cc: if cc:
m['Cc'] = ', '.join(cc) m['Cc'] = ', '.join(cc)
if bcc: if bcc:
m['Bcc'] = ', '.join(bcc) m['Bcc'] = ', '.join(bcc)
if replyto: if replyto:
m['Reply-To'] = ', '.join(replyto) m['Reply-To'] = ', '.join(replyto)
# Fix up all headers to be native strings.
# TODO(durin42): this should probably be cleaned up above in the future.
if pycompat.ispy3:
for hdr, val in list(m.items()):
if isinstance(hdr, bytes):
del m[hdr]
hdr = pycompat.strurl(hdr)
if isinstance(val, bytes):
val = pycompat.strurl(val)
m[hdr] = val
if opts.get('test'): if opts.get('test'):
ui.status(_('displaying '), subj, ' ...\n') ui.status(_('displaying '), subj, ' ...\n')
ui.pager('email') ui.pager('email')
generator = emailgen.Generator(ui, mangle_from_=False) generator = emailgen.Generator(ui, mangle_from_=False)
try: try:
generator.flatten(m, 0) generator.flatten(m, 0)
ui.write('\n') ui.write('\n')
except IOError as inst: except IOError as inst: