Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 36b0052

Browse filesBrowse files
miss-islingtonpicnixzAlexWaygood
authored
[3.13] gh-120662: Improve smtplib example (GH-120668) (#120681)
gh-120662: Improve `smtplib` example (GH-120668) (cherry picked from commit 4bc27ab) Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
1 parent 692874c commit 36b0052
Copy full SHA for 36b0052

File tree

Expand file treeCollapse file tree

1 file changed

+11
-12
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+11
-12
lines changed

‎Doc/library/smtplib.rst

Copy file name to clipboardExpand all lines: Doc/library/smtplib.rst
+11-12Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -556,34 +556,33 @@ This example prompts the user for addresses needed in the message envelope ('To'
556556
and 'From' addresses), and the message to be delivered. Note that the headers
557557
to be included with the message must be included in the message as entered; this
558558
example doesn't do any processing of the :rfc:`822` headers. In particular, the
559-
'To' and 'From' addresses must be included in the message headers explicitly. ::
559+
'To' and 'From' addresses must be included in the message headers explicitly::
560560

561561
import smtplib
562562

563-
def prompt(prompt):
564-
return input(prompt).strip()
563+
def prompt(title):
564+
return input(title).strip()
565565

566-
fromaddr = prompt("From: ")
567-
toaddrs = prompt("To: ").split()
566+
from_addr = prompt("From: ")
567+
to_addrs = prompt("To: ").split()
568568
print("Enter message, end with ^D (Unix) or ^Z (Windows):")
569569

570570
# Add the From: and To: headers at the start!
571-
msg = ("From: %s\r\nTo: %s\r\n\r\n"
572-
% (fromaddr, ", ".join(toaddrs)))
571+
lines = [f"From: {from_addr}", f"To: {', '.join(to_addrs)}", ""]
573572
while True:
574573
try:
575574
line = input()
576575
except EOFError:
577576
break
578-
if not line:
579-
break
580-
msg = msg + line
577+
else:
578+
lines.append(line)
581579

580+
msg = "\r\n".join(lines)
582581
print("Message length is", len(msg))
583582

584-
server = smtplib.SMTP('localhost')
583+
server = smtplib.SMTP("localhost")
585584
server.set_debuglevel(1)
586-
server.sendmail(fromaddr, toaddrs, msg)
585+
server.sendmail(from_addr, to_addrs, msg)
587586
server.quit()
588587

589588
.. note::

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.