Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8effea18
Commit
8effea18
authored
Jun 09, 2014
by
R David Murray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#20903: clarify what happens when an smtp connection timeout occurs.
Patch by Milan Oberkirch.
parent
bfd77b12
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
Doc/library/smtplib.rst
Doc/library/smtplib.rst
+4
-2
No files found.
Doc/library/smtplib.rst
View file @
8effea18
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment