diff options
| author | Barry Warsaw <barry@python.org> | 2022-04-15 00:48:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-15 00:48:59 (GMT) |
| commit | 1fcb39ea64192fc83e7b52f067856bdf977ec2c1 (patch) | |
| tree | dff4a834789692a338f8d210690a6bbfbb614dc4 /Doc/includes | |
| parent | ee475430d431814cbb6eb5e8a6c0ae51943349d4 (diff) | |
| download | cpython-1fcb39ea64192fc83e7b52f067856bdf977ec2c1.zip cpython-1fcb39ea64192fc83e7b52f067856bdf977ec2c1.tar.gz cpython-1fcb39ea64192fc83e7b52f067856bdf977ec2c1.tar.bz2 | |
gh-91520: Rewrite imghdr inlining for clarity and completeness (#91521)
* Rewrite imghdr inlining for clarity and completeness
* Move MIMEImage class back closer to the top of the file since it's the
important thing.
* Use a decorate to mark a given rule function and simplify the rule function
names for clarity.
* Copy over all the imghdr test data files into the email package's test data
directory. This way when imghdr is actually removed, it won't affect the
MIMEImage guessing tests.
* Rewrite and extend the MIMEImage tests to test for all supported
auto-detected MIME image subtypes.
* Remove the now redundant PyBanner048.gif data file.
* See https://github.com/python/cpython/pull/91461#discussion_r850313336
Co-authored-by: Oleg Iarygin <dralife@yandex.ru>
Co-authored-by: Oleg Iarygin <dralife@yandex.ru>
Diffstat (limited to 'Doc/includes')
| -rw-r--r-- | Doc/includes/email-mime.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/includes/email-mime.py b/Doc/includes/email-mime.py index c87db6a..34c6bdb 100644 --- a/Doc/includes/email-mime.py +++ b/Doc/includes/email-mime.py @@ -1,7 +1,7 @@ -# Import smtplib for the actual sending function +# Import smtplib for the actual sending function. import smtplib -# Here are the email package modules we'll need +# Here are the email package modules we'll need. from email.message import EmailMessage # Create the container email message. @@ -13,13 +13,13 @@ msg['From'] = me msg['To'] = ', '.join(family) msg.preamble = 'You will not see this in a MIME-aware mail reader.\n' -# Open the files in binary mode. Use imghdr to figure out the -# MIME subtype for each specific image. +# Open the files in binary mode. You can also omit the subtype +# if you want MIMEImage to guess it. for file in pngfiles: with open(file, 'rb') as fp: img_data = fp.read() msg.add_attachment(img_data, maintype='image', - subtype='jpeg') + subtype='png') # Send the email via our own SMTP server. with smtplib.SMTP('localhost') as s: |