From patchwork Fri Sep 20 17:19:36 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [05,of,10,V3,py3,support] mail: correct import of email module
From: Augie Fackler <raf@durin42.com>
X-Patchwork-Id: 2569
Message-Id: <cda7601831f87cfdc92b.1379697576@arthedain.pit.corp.google.com>
To: mercurial-devel@selenic.com
Date: Fri, 20 Sep 2013 13:19:36 -0400

# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1379686562 14400
#      Fri Sep 20 10:16:02 2013 -0400
# Node ID cda7601831f87cfdc92b5df60646e5a236da0fdf
# Parent  051be411edfb17ba67a1e2bde3d25c5b3e623461
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):