diff options
Diffstat (limited to 'Mailman/pythonlib')
| -rwxr-xr-x | Mailman/pythonlib/smtplib.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Mailman/pythonlib/smtplib.py b/Mailman/pythonlib/smtplib.py index 1c42233f2..c7865ad50 100755 --- a/Mailman/pythonlib/smtplib.py +++ b/Mailman/pythonlib/smtplib.py @@ -2,14 +2,6 @@ '''SMTP/ESMTP client class. -Author: The Dragon De Monsyne <dragondm@integral.org> -ESMTP support, test code and doc fixes added by - Eric S. Raymond <esr@thyrsus.com> -Better RFC 821 compliance (MAIL and RCPT, and CRLF in data) - by Carey Evans <c.evans@clear.net.nz>, for picky mail servers. - -This was modified from the Python 1.5 library HTTP lib. - This should follow RFC 821 (SMTP) and RFC 1869 (ESMTP). Notes: @@ -39,6 +31,14 @@ Example: >>> s.quit() ''' +# Author: The Dragon De Monsyne <dragondm@integral.org> +# ESMTP support, test code and doc fixes added by +# Eric S. Raymond <esr@thyrsus.com> +# Better RFC 821 compliance (MAIL and RCPT, and CRLF in data) +# by Carey Evans <c.evans@clear.net.nz>, for picky mail servers. +# +# This was modified from the Python 1.5 library HTTP lib. + import socket import string import re @@ -213,7 +213,7 @@ class SMTP: if not port: port = SMTP_PORT self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if self.debuglevel > 0: print 'connect:', (host, port) - self.sock.connect(host, port) + self.sock.connect((host, port)) (code,msg)=self.getreply() if self.debuglevel >0 : print "connect:", msg return (code,msg) |