diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2018-01-29 11:10:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-29 11:10:22 (GMT) |
commit | db8189bb8db609ca3993dec31fb95fdbe134469a (patch) | |
tree | fe05a7b31eb4dbd661dab743df4571d3b85a021f | |
parent | 2914bb32e2adf8dff77c0ca58b33201bc94e398c (diff) | |
download | cpython-db8189bb8db609ca3993dec31fb95fdbe134469a.zip cpython-db8189bb8db609ca3993dec31fb95fdbe134469a.tar.gz cpython-db8189bb8db609ca3993dec31fb95fdbe134469a.tar.bz2 |
bpo-31233, bpo-31151: Document socketserver changes (#5417)
socketserver.ForkingMixIn.server_close() and
socketserver.ThreadingMixIn.server_close() now waits until all child
processes and non-daemonic threads complete.
-rw-r--r-- | Doc/library/socketserver.rst | 15 | ||||
-rw-r--r-- | Doc/whatsnew/3.7.rst | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index e12c8c9..5600027 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -115,6 +115,21 @@ server classes. :class:`ForkingMixIn` and the Forking classes mentioned below are only available on POSIX platforms that support :func:`~os.fork`. + :meth:`socketserver.ForkingMixIn.server_close` waits until all child + processes complete. + + :meth:`socketserver.ThreadingMixIn.server_close` waits until all non-daemon + threads complete. Use daemonic threads by setting + :data:`ThreadingMixIn.daemon_threads` to ``True`` to not wait until threads + complete. + + .. versionchanged:: 3.7 + + :meth:`socketserver.ForkingMixIn.server_close` and + :meth:`socketserver.ThreadingMixIn.server_close` now waits until all + child processes and non-daemonic threads complete. + + .. class:: ForkingTCPServer ForkingUDPServer ThreadingTCPServer diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 9979e69..b70945f 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -1021,6 +1021,14 @@ Changes in Python behavior Changes in the Python API ------------------------- +* :meth:`socketserver.ThreadingMixIn.server_close` now waits until all + non-daemon threads complete. Use daemonic threads by setting + :data:`ThreadingMixIn.daemon_threads` to ``True`` to not wait until threads + complete. (Contributed by Victor Stinner in :issue:`31233`.) + +* :meth:`socketserver.ForkingMixIn.server_close` now waits until all + child processes complete. (Contributed by Victor Stinner in :issue:`31151`.) + * The :func:`locale.localeconv` function now sets temporarily the ``LC_CTYPE`` locale to the ``LC_NUMERIC`` locale in some cases. |