comparison hgext/patchbomb.py @ 43629:ec53ea01c9e6

patchbomb: fix wrong argument type when calling mail generator.flatten()
author Denis Laxalde <denis.laxalde@logilab.fr>
date Wed, 13 Nov 2019 17:06:05 +0100
parents af3e341dbf03
children 3781da40eaa6
comparison
equal deleted inserted replaced
43628:ddb5d097d561 43629:ec53ea01c9e6
956 if opts.get(b'test'): 956 if opts.get(b'test'):
957 ui.status(_(b'displaying '), subj, b' ...\n') 957 ui.status(_(b'displaying '), subj, b' ...\n')
958 ui.pager(b'email') 958 ui.pager(b'email')
959 generator = mail.Generator(ui, mangle_from_=False) 959 generator = mail.Generator(ui, mangle_from_=False)
960 try: 960 try:
961 generator.flatten(m, 0) 961 generator.flatten(m, False)
962 ui.write(b'\n') 962 ui.write(b'\n')
963 except IOError as inst: 963 except IOError as inst:
964 if inst.errno != errno.EPIPE: 964 if inst.errno != errno.EPIPE:
965 raise 965 raise
966 else: 966 else:
971 if not mbox: 971 if not mbox:
972 # Exim does not remove the Bcc field 972 # Exim does not remove the Bcc field
973 del m['Bcc'] 973 del m['Bcc']
974 fp = stringio() 974 fp = stringio()
975 generator = mail.Generator(fp, mangle_from_=False) 975 generator = mail.Generator(fp, mangle_from_=False)
976 generator.flatten(m, 0) 976 generator.flatten(m, False)
977 alldests = to + bcc + cc 977 alldests = to + bcc + cc
978 sendmail(sender_addr, alldests, fp.getvalue()) 978 sendmail(sender_addr, alldests, fp.getvalue())
979 979
980 progress.complete() 980 progress.complete()