diff options
| author | R David Murray <rdmurray@bitdance.com> | 2014-06-09 20:41:27 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2014-06-09 20:41:27 (GMT) |
| commit | fa66e01f19b37a5314861dfe3a136783991217e8 (patch) | |
| tree | fd9b6598a3385df1f9a424d59dda1efc5c49a631 /Doc | |
| parent | 3a56117a60ef71709c9a779bfae8b8793600c513 (diff) | |
| parent | 6ceca4e3d850ef2ba81d5f51aac3fe6c0c85284e (diff) | |
| download | cpython-fa66e01f19b37a5314861dfe3a136783991217e8.zip cpython-fa66e01f19b37a5314861dfe3a136783991217e8.tar.gz cpython-fa66e01f19b37a5314861dfe3a136783991217e8.tar.bz2 | |
Merge: #20903: clarify what happens when an smtp connection timeout occurs.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/smtplib.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 46cfa36..8e1bfb5 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -32,7 +32,8 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). than a success code, an :exc:`SMTPConnectError` is raised. The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default timeout - setting will be used). The optional source_address parameter allows to bind + setting will be used). If the timeout expires, :exc:`socket.timeout` is + raised. The optional source_address parameter allows to bind to some specific source address in a machine with multiple network interfaces, and/or to some specific source TCP port. It takes a 2-tuple (host, port), for the socket to bind to as its source address before |