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

miss-islington · dorosch · web-flow · commit fe67a5354010 · 2019-11-15T01:14:44.000-08:00
(cherry picked from commit e8acc86) Co-authored-by: Andrey Doroschenko <dorosch.github.io@yandex.ru>
diff --git a/Doc/includes/email-dir.py b/Doc/includes/email-dir.py
@@ -41,7 +41,7 @@ def main():
         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
@@ -12,7 +12,7 @@
 
 # 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
@@ -43,7 +43,7 @@ def main():
             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
@@ -0,0 +1 @@
+Modernize :mod:`email` examples from %-formatting to f-strings.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Modernize :mod:`email` examples from %-formatting to f-strings.