diff options
| author | Barry Warsaw <barry@python.org> | 2006-03-18 15:41:53 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2006-03-18 15:41:53 (GMT) |
| commit | 40ef0067ad5af2458c54cc0316831ddb701ea3fd (patch) | |
| tree | 52204dc86cfb735d4aadff24864af50da4fe78de /Doc/lib/email-mime.py | |
| parent | 9ae019bf5b92d9ac0ee8bb53829f6b5a16d5fab2 (diff) | |
| download | cpython-40ef0067ad5af2458c54cc0316831ddb701ea3fd.zip cpython-40ef0067ad5af2458c54cc0316831ddb701ea3fd.tar.gz cpython-40ef0067ad5af2458c54cc0316831ddb701ea3fd.tar.bz2 | |
Merge email package 4.0 from the sandbox, including documentation, test cases,
and NEWS updates.
Diffstat (limited to 'Doc/lib/email-mime.py')
| -rw-r--r-- | Doc/lib/email-mime.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Doc/lib/email-mime.py b/Doc/lib/email-mime.py index 048a59f..5097253 100644 --- a/Doc/lib/email-mime.py +++ b/Doc/lib/email-mime.py @@ -2,8 +2,8 @@ import smtplib # Here are the email package modules we'll need -from email.MIMEImage import MIMEImage -from email.MIMEMultipart import MIMEMultipart +from email.mime.image import MIMEImage +from email.mime.multipart import MIMEMultipart COMMASPACE = ', ' @@ -15,8 +15,6 @@ msg['Subject'] = 'Our family reunion' msg['From'] = me msg['To'] = COMMASPACE.join(family) msg.preamble = 'Our family reunion' -# Guarantees the message ends in a newline -msg.epilogue = '' # Assume we know that the image files are all in PNG format for file in pngfiles: |