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

Change interface to sendmail: if the destination address is a string 

instead of a list, turn it into a list containing that string.  This
avoids an apparently common newbie mistake -- passing in a single
string for the destination and have it treated as a sequence of
characters.
This commit is contained in:
Jeremy Hylton 1998-08-13 19:57:46 +00:00
parent 54c52052ce
commit 31bb8cef2c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/smtplib.py
View File

@ -42,6 +42,7 @@ End of HELP info
import socket import socket
import string, re import string, re
import rfc822 import rfc822
import types
SMTP_PORT = 25 SMTP_PORT = 25
CRLF="\r\n" CRLF="\r\n"
@ -317,11 +318,13 @@ class SMTP:
#some useful methods #some useful methods
def sendmail(self,from_addr,to_addrs,msg,mail_options=[],rcpt_options=[]): def sendmail(self, from_addr, to_addrs, msg, mail_options=[],
rcpt_options=[]):
""" This command performs an entire mail transaction. """ This command performs an entire mail transaction.
The arguments are: The arguments are:
- from_addr : The address sending this mail. - from_addr : The address sending this mail.
- to_addrs : a list of addresses to send this mail to - to_addrs : a list of addresses to send this mail to
(a string will be treated as a list with 1 address)
- msg : the message to send. - msg : the message to send.
- mail_options : list of ESMTP options (such as 8bitmime) - mail_options : list of ESMTP options (such as 8bitmime)
for the mail command for the mail command
@ -376,6 +379,8 @@ class SMTP:
self.rset() self.rset()
raise SMTPSenderRefused raise SMTPSenderRefused
senderrs={} senderrs={}
if type(to_addrs) == types.StringType:
to_addrs = [to_addrs]
for each in to_addrs: for each in to_addrs:
(code,resp)=self.rcpt(each, rcpt_options) (code,resp)=self.rcpt(each, rcpt_options)
if (code <> 250) and (code <> 251): if (code <> 250) and (code <> 251):