##// END OF EJS Templates
patchbomb: really use BytesGenerator API...
Yuya Nishihara -
r39140:2e578ece default
parent child Browse files
Show More
@@ -142,7 +142,7 b" configitem('patchbomb', 'to',"
142 142 if pycompat.ispy3:
143 143 _bytesgenerator = emailgen.BytesGenerator
144 144 else:
145 _bytesgenerator = lambda f: f
145 _bytesgenerator = emailgen.Generator
146 146
147 147 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
148 148 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
@@ -806,8 +806,7 b' def email(ui, repo, *revs, **opts):'
806 806 if opts.get('test'):
807 807 ui.status(_('displaying '), subj, ' ...\n')
808 808 ui.pager('email')
809 generator = emailgen.Generator(_bytesgenerator(ui),
810 mangle_from_=False)
809 generator = _bytesgenerator(ui, mangle_from_=False)
811 810 try:
812 811 generator.flatten(m, 0)
813 812 ui.write('\n')
@@ -823,8 +822,7 b' def email(ui, repo, *revs, **opts):'
823 822 # Exim does not remove the Bcc field
824 823 del m['Bcc']
825 824 fp = stringio()
826 generator = emailgen.Generator(_bytesgenerator(fp),
827 mangle_from_=False)
825 generator = _bytesgenerator(fp, mangle_from_=False)
828 826 generator.flatten(m, 0)
829 827 alldests = to + bcc + cc
830 828 alldests = [encoding.strfromlocal(d) for d in alldests]
General Comments 0
You need to be logged in to leave comments. Login now