diff options
author | Éric Araujo <merwok@netwok.org> | 2014-03-12 23:51:50 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2014-03-12 23:51:50 (GMT) |
commit | abdc16ee1bb9819ecc6500a8f1d8720fc2072643 (patch) | |
tree | 6a51cc8277861c729d6d72e75b29a76e504fe7a8 /Doc/library/socket.rst | |
parent | 8546e226bd0b6332ea5af551b9bbd74c2707a3ea (diff) | |
parent | fa5e6e4773ea959a7cc354d54c50df507cf005c3 (diff) | |
download | cpython-abdc16ee1bb9819ecc6500a8f1d8720fc2072643.zip cpython-abdc16ee1bb9819ecc6500a8f1d8720fc2072643.tar.gz cpython-abdc16ee1bb9819ecc6500a8f1d8720fc2072643.tar.bz2 |
Merge 3.3 (#16805)
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r-- | Doc/library/socket.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 8b1b8fb..54c6bad 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -799,6 +799,7 @@ to sockets. :keyword:`with` statement around them. .. note:: + :meth:`close()` releases the resource associated with a connection but does not necessarily close the connection immediately. If you want to close the connection in a timely fashion, call :meth:`shutdown()` |