diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-04-13 18:42:36 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-04-13 18:42:36 (GMT) |
| commit | c1d3daf58b8df00e680e91f0e568270ea8e85adb (patch) | |
| tree | f3d8f195ffc27857b593fd6984a70b9299494b9f /Lib | |
| parent | 6d80046628759bc721640f7f888aa386529d0239 (diff) | |
| parent | 0bfd6acf03640f8910b8f9fa10cc7775a7c55449 (diff) | |
| download | cpython-c1d3daf58b8df00e680e91f0e568270ea8e85adb.zip cpython-c1d3daf58b8df00e680e91f0e568270ea8e85adb.tar.gz cpython-c1d3daf58b8df00e680e91f0e568270ea8e85adb.tar.bz2 | |
Merge #2118: clarify smtplib exception documentation.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/smtplib.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 69c0186..50a087c 100644 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -221,8 +221,9 @@ class SMTP: If specified, `host' is the name of the remote host to which to connect. If specified, `port' specifies the port to which to connect. - By default, smtplib.SMTP_PORT is used. An SMTPConnectError is raised - if the specified `host' doesn't respond correctly. If specified, + By default, smtplib.SMTP_PORT is used. If a host is specified the + connect method is called, and if it returns anything other than + a success code an SMTPConnectError is raised. If specified, `local_hostname` is used as the FQDN of the local host. By default, the local hostname is found using socket.getfqdn(). The `source_address` parameter takes a 2-tuple (host, port) for the socket |