Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-120662: Improve `smtplib` example (#120668) 

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
Bénédikt Tran 2024-06-18 13:56:58 +02:00 committed by GitHub
parent 3044d3866e
commit 4bc27abdbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Doc/library/smtplib.rst
View File

@ -556,34 +556,33 @@ This example prompts the user for addresses needed in the message envelope ('To'
and 'From' addresses), and the message to be delivered. Note that the headers and 'From' addresses), and the message to be delivered. Note that the headers
to be included with the message must be included in the message as entered; this to be included with the message must be included in the message as entered; this
example doesn't do any processing of the :rfc:`822` headers. In particular, the example doesn't do any processing of the :rfc:`822` headers. In particular, the
'To' and 'From' addresses must be included in the message headers explicitly. :: 'To' and 'From' addresses must be included in the message headers explicitly::
import smtplib import smtplib
def prompt(prompt): def prompt(title):
return input(prompt).strip() return input(title).strip()
fromaddr = prompt("From: ") from_addr = prompt("From: ")
toaddrs = prompt("To: ").split() to_addrs = prompt("To: ").split()
print("Enter message, end with ^D (Unix) or ^Z (Windows):") print("Enter message, end with ^D (Unix) or ^Z (Windows):")
# Add the From: and To: headers at the start! # Add the From: and To: headers at the start!
msg = ("From: %s\r\nTo: %s\r\n\r\n" lines = [f"From: {from_addr}", f"To: {', '.join(to_addrs)}", ""]
% (fromaddr, ", ".join(toaddrs)))
while True: while True:
try: try:
line = input() line = input()
except EOFError: except EOFError:
break break
if not line: else:
break lines.append(line)
msg = msg + line
msg = "\r\n".join(lines)
print("Message length is", len(msg)) print("Message length is", len(msg))
server = smtplib.SMTP('localhost') server = smtplib.SMTP("localhost")
server.set_debuglevel(1) server.set_debuglevel(1)
server.sendmail(fromaddr, toaddrs, msg) server.sendmail(from_addr, to_addrs, msg)
server.quit() server.quit()
.. note:: .. note::