Skip to content

bpo-32657 Removing mutable entry from send_message #5334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chason wants to merge 3 commits into from
Closed

bpo-32657 Removing mutable entry from send_message #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abe37c7
bpo-32657 Removing mutable entry from send_message
Jan 26, 2018
3d30bcd
bpo-32657 Modifying NEWS.d per bitdancer
Jan 26, 2018
07a1777
bpo-32657 adding documentation change
Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/library/smtplib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ An :class:`SMTP` instance has the following methods:


.. method:: SMTP.send_message(msg, from_addr=None, to_addrs=None, \
mail_options=[], rcpt_options=[])
mail_options=None, rcpt_options=None)

This is a convenience method for calling :meth:`sendmail` with the message
represented by an :class:`email.message.Message` object. The arguments have
Expand Down
6 changes: 5 additions & 1 deletion Lib/smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ def sendmail(self, from_addr, to_addrs, msg, mail_options=[],
return senderrs

def send_message(self, msg, from_addr=None, to_addrs=None,
mail_options=[], rcpt_options={}):
mail_options=None, rcpt_options=None):
"""Converts message to a bytestring and passes it to sendmail.

The arguments are as for sendmail, except that msg is an
Expand Down Expand Up @@ -939,6 +939,10 @@ def send_message(self, msg, from_addr=None, to_addrs=None,
msg[header_prefix + 'Cc'])
if f is not None]
to_addrs = [a[1] for a in email.utils.getaddresses(addr_fields)]
if mail_options is None:
mail_options = []
if rcpt_options is None:
rcpt_options = []
# Make a local copy so we can delete the bcc headers.
msg_copy = copy.copy(msg)
del msg_copy['Bcc']
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-01-26-12-34-01.bpo-32657.gYp2Zz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Removed mutable defaults for mail_options and rcpt_options from
`SMTP.send_message`