From 6ceca4e3d850ef2ba81d5f51aac3fe6c0c85284e Mon Sep 17 00:00:00 2001 From: R David Murray Date: Mon, 9 Jun 2014 16:41:06 -0400 Subject: [PATCH] #20903: clarify what happens when an smtp connection timeout occurs. Patch by Milan Oberkirch. --- Doc/library/smtplib.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 46cfa360003..8e1bfb57f94 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