| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Maybe BytesGenerator can be used instead?
https://docs.python.org/3/library/email.generator.html#email.generator.BytesGenerator
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/patchbomb.py (11 lines) |
| ) | ) | ||||
| configitem('patchbomb', 'reply-to', | configitem('patchbomb', 'reply-to', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| configitem('patchbomb', 'to', | configitem('patchbomb', 'to', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| if pycompat.ispy3: | |||||
| _bytesgenerator = emailgen.BytesGenerator | |||||
| else: | |||||
| _bytesgenerator = lambda f: f | |||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| def _addpullheader(seq, ctx): | def _addpullheader(seq, ctx): | ||||
| """Add a header pointing to a public URL where the changeset is available | """Add a header pointing to a public URL where the changeset is available | ||||
| del m[hdr] | del m[hdr] | ||||
| hdr = pycompat.strurl(hdr) | hdr = pycompat.strurl(hdr) | ||||
| if isinstance(val, bytes): | if isinstance(val, bytes): | ||||
| val = pycompat.strurl(val) | val = pycompat.strurl(val) | ||||
| m[hdr] = 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(_bytesgenerator(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: | ||||
| if inst.errno != errno.EPIPE: | if inst.errno != errno.EPIPE: | ||||
| raise | raise | ||||
| else: | else: | ||||
| if not sendmail: | if not sendmail: | ||||
| sendmail = mail.connect(ui, mbox=mbox) | sendmail = mail.connect(ui, mbox=mbox) | ||||
| ui.status(_('sending '), subj, ' ...\n') | ui.status(_('sending '), subj, ' ...\n') | ||||
| 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(fp, mangle_from_=False) | generator = emailgen.Generator(_bytesgenerator(fp), | ||||
| mangle_from_=False) | |||||
| generator.flatten(m, 0) | generator.flatten(m, 0) | ||||
| sendmail(sender_addr, to + bcc + cc, fp.getvalue()) | sendmail(sender_addr, to + bcc + cc, fp.getvalue()) | ||||
| progress.complete() | progress.complete() | ||||