1 files changed, 14 insertions, 15 deletions
diff --git a/Doc/includes/email-mime.py b/Doc/includes/email-mime.py
index 61d0830..c610242 100644
--- a/Doc/includes/email-mime.py
+++ b/Doc/includes/email-mime.py
@@ -1,30 +1,29 @@
 # Import smtplib for the actual sending function
 import smtplib
 
-# Here are the email package modules we'll need
-from email.mime.image import MIMEImage
-from email.mime.multipart import MIMEMultipart
+# And imghdr to find the types of our images
+import imghdr
 
-COMMASPACE = ', '
+# Here are the email package modules we'll need
+from email.message import EmailMessage
 
-# Create the container (outer) email message.
-msg = MIMEMultipart()
+# Create the container email message.
+msg = EmailMessage()
 msg['Subject'] = 'Our family reunion'
 # me == the sender's email address
 # family = the list of all recipients' email addresses
 msg['From'] = me
-msg['To'] = COMMASPACE.join(family)
+msg['To'] = ', '.join(family)
 msg.preamble = 'Our family reunion'
 
-# Assume we know that the image files are all in PNG format
+# Open the files in binary mode.  Use imghdr to figure out the
+# MIME subtype for each specific image.
 for file in pngfiles:
-    # Open the files in binary mode.  Let the MIMEImage class automatically
-    # guess the specific image type.
     with open(file, 'rb') as fp:
-        img = MIMEImage(fp.read())
-    msg.attach(img)
+        img_data = fp.read()
+    msg.add_attachment(img_data, maintype='image',
+                                 subtype=imghdr.what(None, img_data))
 
 # Send the email via our own SMTP server.
-s = smtplib.SMTP('localhost')
-s.send_message(msg)
-s.quit()
+with smtplib.SMTP('localhost') as s:
+    s.send_message(msg)