diff options
| author | Andrey Doroschenko <dorosch.github.io@yandex.ru> | 2019-11-15 12:03:47 +0300 |
|---|---|---|
| committer | Tal Einat <taleinat+github@gmail.com> | 2019-11-15 11:03:46 +0200 |
| commit | e8acc865a3f112b98417f676c897ca6ec2dac2c7 (patch) | |
| tree | db2a9c6f7a4a643a64bad3a540083b5f45b02caa | |
| parent | b44ffc8b409fd539c5fb2b79385498e9fe168880 (diff) | |
| download | cpython-git-e8acc865a3f112b98417f676c897ca6ec2dac2c7.tar.gz | |
bpo-38351: Modernize email examples from %-formatting to f-strings (GH-17162)
| -rw-r--r-- | Doc/includes/email-dir.py | 2 | ||||
| -rw-r--r-- | Doc/includes/email-simple.py | 2 | ||||
| -rw-r--r-- | Doc/includes/email-unpack.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Documentation/2019-11-15-09-22-28.bpo-38351.xwhlse.rst | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Doc/includes/email-dir.py b/Doc/includes/email-dir.py index 0dcfbfb402..2fc1570e65 100644 --- a/Doc/includes/email-dir.py +++ b/Doc/includes/email-dir.py @@ -41,7 +41,7 @@ must be running an SMTP server. directory = '.' # Create the message 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['From'] = args.sender msg.preamble = 'You will not see this in a MIME-aware mail reader.\n' diff --git a/Doc/includes/email-simple.py b/Doc/includes/email-simple.py index f69ef40ff0..07dc30fd06 100644 --- a/Doc/includes/email-simple.py +++ b/Doc/includes/email-simple.py @@ -12,7 +12,7 @@ with open(textfile) as fp: # me == the sender'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['To'] = you diff --git a/Doc/includes/email-unpack.py b/Doc/includes/email-unpack.py index e0a7f01f58..c8cb0be456 100644 --- a/Doc/includes/email-unpack.py +++ b/Doc/includes/email-unpack.py @@ -43,7 +43,7 @@ Unpack a MIME message into a directory of files. if not ext: # Use a generic bag-of-bits extension ext = '.bin' - filename = 'part-%03d%s' % (counter, ext) + filename = f'part-{counter:03d}{ext}' counter += 1 with open(os.path.join(args.directory, filename), 'wb') as fp: fp.write(part.get_payload(decode=True)) diff --git a/Misc/NEWS.d/next/Documentation/2019-11-15-09-22-28.bpo-38351.xwhlse.rst b/Misc/NEWS.d/next/Documentation/2019-11-15-09-22-28.bpo-38351.xwhlse.rst new file mode 100644 index 0000000000..8e0dc9eb4c --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2019-11-15-09-22-28.bpo-38351.xwhlse.rst @@ -0,0 +1 @@ +Modernize :mod:`email` examples from %-formatting to f-strings.
\ No newline at end of file |