changeset 2215:2fb062777b54

Merged thomaswaldmann/moin-2.0 into default
author Ashutosh Singla <ashu1461@gmail.com>
date Tue, 07 May 2013 13:26:56 +0530
parents 5dab351a8752 (current diff) 678c1bd96267 (diff)
children 7a47e226fc71
files
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/mail/_tests/test_sendmail.py	Sat May 04 23:48:24 2013 +0530
+++ b/MoinMoin/mail/_tests/test_sendmail.py	Tue May 07 13:26:56 2013 +0530
@@ -7,8 +7,8 @@
 """
 
 
-from email.Charset import Charset, QP
-from email.Header import Header
+from email.charset import Charset, QP
+from email.header import Header
 
 from MoinMoin.mail import sendmail
 from MoinMoin.constants.contenttypes import CHARSET
--- a/MoinMoin/mail/sendmail.py	Sat May 04 23:48:24 2013 +0530
+++ b/MoinMoin/mail/sendmail.py	Tue May 07 13:26:56 2013 +0530
@@ -10,7 +10,7 @@
 
 import os
 import re
-from email.Header import Header
+from email.header import Header
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
@@ -82,9 +82,9 @@
     """
     import smtplib
     import socket
-    from email.Message import Message
-    from email.Charset import Charset, QP
-    from email.Utils import formatdate, make_msgid
+    from email.message import Message
+    from email.charset import Charset, QP
+    from email.utils import formatdate, make_msgid
 
     cfg = app.cfg
     if not cfg.mail_enabled: