Remove Python 2.1 to 2.4 compatibility for email modules

[Peter Suter]

In #386 email imports were changed to local imports for Python 2.1 compatibility. We could again use normal imports.

Also in Python 2.5 all email submodules ​have been renamed according to PEP 8 standards. We still use the old uppercase names.

trac/notification/compat.py

@@ -15 +15 @@
 
 import re
 from abc import ABCMeta, abstractmethod
+from email.utils import formatdate
 
 from genshi.builder import tag
 
@@ -175 +176 @@
             reactivate(t)
 
     def send(self, torcpts, ccrcpts, mime_headers={}):
-        from email.Utils import formatdate
         body = self._format_body()
         public_cc = self.config.getbool('notification', 'use_public_cc')
         headers = {

trac/notification/mail.py

@@ -20 +20 @@
 import re
 import smtplib
 import time
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.Utils import formatdate, parseaddr, getaddresses
+from email.charset import BASE64, QP, SHORTEST, Charset
+from email.header import Header
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.utils import formatdate, parseaddr, getaddresses
 from hashlib import md5
 from subprocess import Popen, PIPE
 
@@ -69 +71 @@
     Quoted-Printable, and 'none' for no encoding, in which case mails will
     be sent as 7bit if the content is all ASCII, or 8bit otherwise.
     """
-    from email.Charset import BASE64, QP, SHORTEST, Charset
     charset = Charset()
     charset.input_charset = 'utf-8'
     charset.output_charset = 'utf-8'
@@ -93 +94 @@
 
 def create_header(key, name, charset):
     """Create an appropriate email Header."""
-    from email.Header import Header
     maxlength = MAXHEADERLEN-(len(key)+2)
     # Do not sent ridiculous short headers
     if maxlength < 10:

trac/util/__init__.py

@@ -744 +744 @@
         else:
             return {}
     import email
+    import email.errors
     from trac.util.translation import _
     attrs = ('author', 'author-email', 'license', 'home-page', 'summary',
              'description', 'version')
@@ -760 +761 @@
                 metadata=metadata, dist=dist, err=to_unicode(e))
         for attr in attrs:
             info[normalize(attr)] = err
-    except email.Errors.MessageError as e:
+    except email.errors.MessageError as e:
         err = _("Failed to parse %(metadata)s file for %(dist)s: %(err)s",
                 metadata=metadata, dist=dist, err=to_unicode(e))
         for attr in attrs:

[Peter Suter]

Committed in [13577].