From 5a5fe17dac8dc30dea4c6136814bb4e0d35ae487 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 18 Jun 2018 00:50:47 +0000 Subject: [PATCH 49/54] Python 3 preparation: update email module names. --- roundup/cgi/client.py | 6 +++--- roundup/roundupdb.py | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py index 5dadb2c..918e0b4 100644 --- a/roundup/cgi/client.py +++ b/roundup/cgi/client.py @@ -44,9 +44,9 @@ from roundup.anypy import http_ 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 diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py index 868bfd7..fd0b5ca 100644 --- a/roundup/roundupdb.py +++ b/roundup/roundupdb.py @@ -24,13 +24,13 @@ import re, os, smtplib, socket, time, random 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 @@ class IssueClass: 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) -- 2.7.4