From 38d27aa253122ef2ae78f4ea27b20eb07ae1dd9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Fri, 5 Mar 2021 22:02:36 +0100 Subject: [PATCH 1/9] Update socketserver.rst --- Doc/library/socketserver.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 232c0616d925dc..be07eb60020fdb 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -94,7 +94,7 @@ synchronous servers of four types:: Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from :class:`UnixStreamServer` --- the only difference between an IP and a Unix -stream server is the address family, which is simply repeated in both Unix +server is the address family, which is simply repeated in both Unix server classes. From dcea65be25fd3bb7838f2d6cb902823028849033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Fri, 5 Mar 2021 22:17:54 +0100 Subject: [PATCH 2/9] Fix the class diagram --- Doc/library/socketserver.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index be07eb60020fdb..b992439a3c8077 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -81,15 +81,15 @@ synchronous servers of four types:: +------------+ | BaseServer | +------------+ + ^ | - v +-----------+ +------------------+ - | TCPServer |------->| UnixStreamServer | + | TCPServer |<-------| UnixStreamServer | +-----------+ +------------------+ + ^ | - v +-----------+ +--------------------+ - | UDPServer |------->| UnixDatagramServer | + | UDPServer |<-------| UnixDatagramServer | +-----------+ +--------------------+ Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from From 126273b422f7fb95ae98b96d4c467fa6631ff417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Mon, 8 Mar 2021 16:39:53 +0100 Subject: [PATCH 3/9] Remove a no longer valid restriction for wfile --- Doc/library/socketserver.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index b992439a3c8077..ee7d813f71c43e 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -433,7 +433,7 @@ Request Handler Objects The :attr:`rfile` attributes of both classes support the :class:`io.BufferedIOBase` readable interface, and - :attr:`DatagramRequestHandler.wfile` supports the + the :attr:`wfile` attributes of both classes support the :class:`io.BufferedIOBase` writable interface. .. versionchanged:: 3.6 From 62d3aa698120a2be43fadeb38791aad4ffa622db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Mon, 28 Nov 2022 18:34:52 +0100 Subject: [PATCH 4/9] =?UTF-8?q?Apply=20Erlend=E2=80=99s=20change=20suggest?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/library/socketserver.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index ee7d813f71c43e..37626adbb19ae9 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -430,11 +430,8 @@ Request Handler Objects The :attr:`self.rfile` and :attr:`self.wfile` attributes can be read or written, respectively, to get the request data or return data to the client. - - The :attr:`rfile` attributes of both classes support the - :class:`io.BufferedIOBase` readable interface, and - the :attr:`wfile` attributes of both classes support the - :class:`io.BufferedIOBase` writable interface. + The :attr:`!rfile` attributes support the :class:`io.BufferedIOBase` readable interface, + and :attr:`!wfile` attributes support the :class:`!io.BufferedIOBase` writable interface. .. versionchanged:: 3.6 :attr:`StreamRequestHandler.wfile` also supports the From a033dc8c67e3854719e4e9f3e8edbc15dd437e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Mon, 28 Nov 2022 18:37:27 +0100 Subject: [PATCH 5/9] Revert arrow direction in class diagram --- Doc/library/socketserver.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 37626adbb19ae9..77eff1533d43df 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -81,15 +81,15 @@ synchronous servers of four types:: +------------+ | BaseServer | +------------+ - ^ | + v +-----------+ +------------------+ - | TCPServer |<-------| UnixStreamServer | + | TCPServer |------->| UnixStreamServer | +-----------+ +------------------+ - ^ | + v +-----------+ +--------------------+ - | UDPServer |<-------| UnixDatagramServer | + | UDPServer |------->| UnixDatagramServer | +-----------+ +--------------------+ Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from From 512d06c3e748073e00622bbccf140a7ce52907e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Tue, 29 Nov 2022 00:15:54 +0100 Subject: [PATCH 6/9] =?UTF-8?q?Apply=20Erlend=E2=80=99s=20suggested=20chan?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/library/socketserver.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 77eff1533d43df..af83813ea0c0d4 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -93,9 +93,9 @@ synchronous servers of four types:: +-----------+ +--------------------+ Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from -:class:`UnixStreamServer` --- the only difference between an IP and a Unix -server is the address family, which is simply repeated in both Unix -server classes. +:class:`UnixStreamServer` --- the only difference between a TCP or UDP server +and a Unix stream or datagram server is the address family, which is simply repeated in both Unix +stream and datagram server classes. .. class:: ForkingMixIn From f6cd6526e280d63ec295df5a0fab7ba3bbb9b7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Tue, 29 Nov 2022 10:55:03 +0100 Subject: [PATCH 7/9] Update socketserver.rst --- Doc/library/socketserver.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index af83813ea0c0d4..696965372ab2eb 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -94,7 +94,7 @@ synchronous servers of four types:: Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from :class:`UnixStreamServer` --- the only difference between a TCP or UDP server -and a Unix stream or datagram server is the address family, which is simply repeated in both Unix +and a Unix stream or datagram server is the address family, which is simply repeated in Unix stream and datagram server classes. From 57604b983463a3c79f38dd5fd85cc16bd34bad1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Tue, 29 Nov 2022 17:11:35 +0100 Subject: [PATCH 8/9] =?UTF-8?q?Apply=20Erlend=E2=80=99s=20suggestion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/library/socketserver.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 696965372ab2eb..f9be0d09f481ba 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -93,9 +93,7 @@ synchronous servers of four types:: +-----------+ +--------------------+ Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from -:class:`UnixStreamServer` --- the only difference between a TCP or UDP server -and a Unix stream or datagram server is the address family, which is simply repeated in Unix -stream and datagram server classes. +:class:`UnixStreamServer` --- the only difference between an IP and a Unix server is the address family. .. class:: ForkingMixIn From a55c279cd9244c7179ac69131efce1c8291365de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Ogam?= Date: Tue, 29 Nov 2022 17:37:08 +0100 Subject: [PATCH 9/9] Update Doc/library/socketserver.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Éric --- Doc/library/socketserver.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index f9be0d09f481ba..596e16dfd6b75e 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -93,7 +93,8 @@ synchronous servers of four types:: +-----------+ +--------------------+ Note that :class:`UnixDatagramServer` derives from :class:`UDPServer`, not from -:class:`UnixStreamServer` --- the only difference between an IP and a Unix server is the address family. +:class:`UnixStreamServer` --- the only difference between an IP and a Unix +server is the address family. .. class:: ForkingMixIn