From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 9 Jun 2014 20:40:47 +0000 (-0400)
Subject: #20903: clarify what happens when an smtp connection timeout occurs.
X-Git-Tag: v2.7.8~37^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd35484662ee756e3aa092f49ff7d75051fee354;p=python

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

Patch by Milan Oberkirch.
---

diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index e145659f62..5b2808d41e 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).
+   setting will be used).  If the timeout expires, :exc:`socket.timeout`
+   is raised.
 
    For normal use, you should only require the initialization/connect,
    :meth:`sendmail`, and :meth:`~smtplib.quit` methods.
@@ -54,7 +55,8 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions).
    formatted private key and certificate chain file for the SSL connection. 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).
+   timeout setting will be used).  If the timeout expires, :exc:`socket.timeout`
+   is raised.
 
    .. versionadded:: 2.6