# HG changeset patch # User Augie Fackler # Date 2013-09-20 14:16:02 # Node ID 53f16f4aff3347d5f77a645037f6a134dc9fabd6 # Parent b054a241257d057f772818f083aa85bc7915a25c mail: correct import of email module diff --git a/mercurial/mail.py b/mercurial/mail.py --- a/mercurial/mail.py +++ b/mercurial/mail.py @@ -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):