Patchwork [05,of,10,V3,py3,support] mail: correct import of email module

login
register
mail settings
Submitter Augie Fackler
Date Sept. 20, 2013, 5:19 p.m.
Message ID <cda7601831f87cfdc92b.1379697576@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/2569/
State Accepted
Commit 53f16f4aff3347d5f77a645037f6a134dc9fabd6
Headers show

Comments

Augie Fackler - Sept. 20, 2013, 5:19 p.m.
# 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

Patch

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):