[Python-checkins] bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH-18929)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/64937d308c71a5c95627b0a0d0574d164c0cf30a
commit: 64937d308c71a5c95627b0a0d0574d164c0cf30a
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-03-20T01:08:47-07:00
summary:

bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH-18929)


Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac97981c30e9c1001b05a771f52a41772c54)

Co-authored-by: amaajemyfren <32741226+amaajemyfren at users.noreply.github.com>

files:
M Doc/library/socketserver.rst

diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 7c8c8d52e03d9..232c0616d925d 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -237,6 +237,8 @@ Server Objects
    .. method:: shutdown()
 
       Tell the :meth:`serve_forever` loop to stop and wait until it does.
+      :meth:`shutdown` must be called while :meth:`serve_forever` is running in a
+      different thread otherwise it will deadlock.
 
 
    .. method:: server_close()