diff -r 1fb9e01328e4 -r f449138a52df hgext/patchbomb.py --- a/hgext/patchbomb.py Mon Feb 26 16:16:37 2018 +0530 +++ b/hgext/patchbomb.py Mon Feb 26 16:22:15 2018 +0530 @@ -74,6 +74,7 @@ from __future__ import absolute_import import email as emailmod +import email.generator as emailgen import errno import os import socket @@ -777,7 +778,7 @@ if opts.get('test'): ui.status(_('displaying '), subj, ' ...\n') ui.pager('email') - generator = emailmod.Generator.Generator(ui, mangle_from_=False) + generator = emailgen.Generator(ui, mangle_from_=False) try: generator.flatten(m, 0) ui.write('\n') @@ -794,7 +795,7 @@ # Exim does not remove the Bcc field del m['Bcc'] fp = stringio() - generator = emailmod.Generator.Generator(fp, mangle_from_=False) + generator = emailgen.Generator(fp, mangle_from_=False) generator.flatten(m, 0) sendmail(sender_addr, to + bcc + cc, fp.getvalue())