Merge: #20903: clarify what happens when an smtp connection timeout occurs.

This commit is contained in:
R David Murray 2014-06-09 16:41:27 -04:00
commit fa66e01f19
1 changed files with 2 additions and 1 deletions

View File

@ -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