Python 3 preparation: update email module names.

Various email.* modules were renamed in Python 2.5, and backwards
compatibility for the old names was removed in Python 3.

Author: jsm28

roundup/cgi/client.py

@@ -44,9 +44,9 @@
 from roundup.anypy import urllib_
 from roundup.anypy import xmlrpc_
 
-from email.MIMEBase import MIMEBase
-from email.MIMEText import MIMEText
-from email.MIMEMultipart import MIMEMultipart
+from email.mime.base import MIMEBase
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
 import roundup.anypy.email_
 
 from roundup.anypy.strings import uchr

roundup/roundupdb.py

@@ -24,13 +24,13 @@
 import base64, mimetypes
 import os.path
 import logging
-from email import Encoders
+from email import encoders
 from email.parser import FeedParser
-from email.Utils import formataddr
-from email.Header import Header
-from email.MIMEText import MIMEText
-from email.MIMEBase import MIMEBase
-from email.MIMEMultipart import MIMEMultipart
+from email.utils import formataddr
+from email.header import Header
+from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email.mime.multipart import MIMEMultipart
 
 from roundup import password, date, hyperdb
 from roundup.i18n import _
@@ -643,7 +643,7 @@ def send_message(self, issueid, msgid, note, sendto, from_address=None,
                         main, sub = mime_type.split('/')
                         part = MIMEBase(main, sub)
                         part.set_payload(content)
-                        Encoders.encode_base64(part)
+                        encoders.encode_base64(part)
                     cd = 'Content-Disposition'
                     part[cd] = 'attachment;\n filename="%s"'%name
                     message.attach(part)