bpo-38351: Modernize email examples from %-formatting to f-strings (GH-17162)

This commit is contained in:
Andrey Doroschenko 2019-11-15 12:03:47 +03:00 committed by Tal Einat
parent b44ffc8b40
commit e8acc865a3
4 changed files with 4 additions and 3 deletions

View File

@ -41,7 +41,7 @@ must be running an SMTP server.
directory = '.' directory = '.'
# Create the message # Create the message
msg = EmailMessage() msg = EmailMessage()
msg['Subject'] = 'Contents of directory %s' % os.path.abspath(directory) msg['Subject'] = f'Contents of directory {os.path.abspath(directory)}'
msg['To'] = ', '.join(args.recipients) msg['To'] = ', '.join(args.recipients)
msg['From'] = args.sender msg['From'] = args.sender
msg.preamble = 'You will not see this in a MIME-aware mail reader.\n' msg.preamble = 'You will not see this in a MIME-aware mail reader.\n'

View File

@ -12,7 +12,7 @@ with open(textfile) as fp:
# me == the sender's email address # me == the sender's email address
# you == the recipient's email address # you == the recipient's email address
msg['Subject'] = 'The contents of %s' % textfile msg['Subject'] = f'The contents of {textfile}'
msg['From'] = me msg['From'] = me
msg['To'] = you msg['To'] = you

View File

@ -43,7 +43,7 @@ Unpack a MIME message into a directory of files.
if not ext: if not ext:
# Use a generic bag-of-bits extension # Use a generic bag-of-bits extension
ext = '.bin' ext = '.bin'
filename = 'part-%03d%s' % (counter, ext) filename = f'part-{counter:03d}{ext}'
counter += 1 counter += 1
with open(os.path.join(args.directory, filename), 'wb') as fp: with open(os.path.join(args.directory, filename), 'wb') as fp:
fp.write(part.get_payload(decode=True)) fp.write(part.get_payload(decode=True))

View File

@ -0,0 +1 @@
Modernize :mod:`email` examples from %-formatting to f-strings.