changeset 6108:c788f228845e

from email.lowercase import ...
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 06 Sep 2016 02:09:19 +0200
parents dc5ef93e8609
children 51211e70a3a8
files MoinMoin/mail/_tests/test_sendmail.py MoinMoin/mail/mailimport.py MoinMoin/mail/sendmail.py MoinMoin/util/timefuncs.py
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/mail/_tests/test_sendmail.py	Tue Sep 06 02:04:16 2016 +0200
+++ b/MoinMoin/mail/_tests/test_sendmail.py	Tue Sep 06 02:09:19 2016 +0200
@@ -6,8 +6,8 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-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 import config
 
--- a/MoinMoin/mail/mailimport.py	Tue Sep 06 02:04:16 2016 +0200
+++ b/MoinMoin/mail/mailimport.py	Tue Sep 06 02:09:19 2016 +0200
@@ -11,8 +11,8 @@
 
 import sys, re, time
 import email
-from email.Utils import getaddresses, parsedate_tz, mktime_tz
-from email.Header import decode_header
+from email.utils import getaddresses, parsedate_tz, mktime_tz
+from email.header import decode_header
 
 from MoinMoin import wikiutil, user
 from MoinMoin.action.AttachFile import add_attachment, AttachmentAlreadyExists
--- a/MoinMoin/mail/sendmail.py	Tue Sep 06 02:04:16 2016 +0200
+++ b/MoinMoin/mail/sendmail.py	Tue Sep 06 02:09:19 2016 +0200
@@ -8,7 +8,7 @@
 """
 
 import os, re
-from email.Header import Header
+from email.header import Header
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
@@ -68,9 +68,9 @@
     @return: (is_ok, Description of error or OK message)
     """
     import smtplib, 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
 
     _ = request.getText
     cfg = request.cfg
--- a/MoinMoin/util/timefuncs.py	Tue Sep 06 02:04:16 2016 +0200
+++ b/MoinMoin/util/timefuncs.py	Tue Sep 06 02:09:19 2016 +0200
@@ -8,7 +8,7 @@
 
 # we guarantee that time is always imported!
 import re, time
-from email.Utils import formatdate
+from email.utils import formatdate
 
 def tmtuple(tmsecs=None):
     """ Return a time tuple.