# HG changeset patch # User Augie Fackler # Date 1379686562 14400 # Node ID 53f16f4aff3347d5f77a645037f6a134dc9fabd6 # Parent b054a241257d057f772818f083aa85bc7915a25c mail: correct import of email module diff -r b054a241257d -r 53f16f4aff33 mercurial/mail.py --- a/mercurial/mail.py Fri Sep 20 10:15:51 2013 -0400 +++ b/mercurial/mail.py Fri Sep 20 10:16:02 2013 -0400 @@ -8,7 +8,7 @@ from i18n import _ import util, encoding, sslutil import os, smtplib, socket, quopri, time, sys -import email.Header, email.MIMEText, email.Utils +import email _oldheaderinit = email.Header.Header.__init__ def _unifiedheaderinit(self, *args, **kw):