summaryrefslogtreecommitdiffstats
path: root/Lib/smtplib.py
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>1998-08-13 19:57:46 (GMT)
committerJeremy Hylton <jeremy@alum.mit.edu>1998-08-13 19:57:46 (GMT)
commit31bb8cef2c528591bc6b2abefff34cbcbfd121f3 (patch)
tree0b6d08e53a07fb78335de365370efbd41b028eb5 /Lib/smtplib.py
parent54c52052cebc00ceeb4f1f8b48453b675d037ba1 (diff)
downloadcpython-31bb8cef2c528591bc6b2abefff34cbcbfd121f3.zip
cpython-31bb8cef2c528591bc6b2abefff34cbcbfd121f3.tar.gz
cpython-31bb8cef2c528591bc6b2abefff34cbcbfd121f3.tar.bz2
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.
Diffstat (limited to 'Lib/smtplib.py')
-rwxr-xr-xLib/smtplib.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index a812ef9..07f53fa 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -42,6 +42,7 @@ End of HELP info
import socket
import string, re
import rfc822
+import types
SMTP_PORT = 25
CRLF="\r\n"
@@ -317,11 +318,13 @@ class SMTP:
#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.
The arguments are:
- from_addr : The address sending this mail.
- 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.
- mail_options : list of ESMTP options (such as 8bitmime)
for the mail command
@@ -376,6 +379,8 @@ class SMTP:
self.rset()
raise SMTPSenderRefused
senderrs={}
+ if type(to_addrs) == types.StringType:
+ to_addrs = [to_addrs]
for each in to_addrs:
(code,resp)=self.rcpt(each, rcpt_options)
if (code <> 250) and (code <> 251):