[3.12] gh-110383: Document `socket.makefile()` accepts combined modes (GH-119150...

The supported mode values are 'r', 'w', and 'b', or a combination of those.
(cherry picked from commit 62a29be5bb01c2d0f72d8f9b1b5539816e65310c)

Co-authored-by: Daniel Williams <dann0a@gmail.com>

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index cad03a98b485b8e44dc05f3df8234e99f82432ee..10f03b3fe0274e5069783587863549b6eb279483 100644 (file)
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1584,7 +1584,8 @@ to sockets.
    Return a :term:`file object` associated with the socket.  The exact returned
    type depends on the arguments given to :meth:`makefile`.  These arguments are
    interpreted the same way as by the built-in :func:`open` function, except
-   the only supported *mode* values are ``'r'`` (default), ``'w'`` and ``'b'``.
+   the only supported *mode* values are ``'r'`` (default), ``'w'``, ``'b'``, or
+   a combination of those.
 
    The socket must be in blocking mode; it can have a timeout, but the file
    object's internal buffer may end up in an inconsistent state if a timeout

diff --git a/Lib/socket.py b/Lib/socket.py
index 42ee130773264455a85dfd7608f96edfe13c43ff..d796082e054fa714d716881c12fd3cf7e6e63d7d 100644 (file)
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -306,7 +306,8 @@ class socket(_socket.socket):
         """makefile(...) -> an I/O stream connected to the socket
 
         The arguments are as for io.open() after the filename, except the only
-        supported mode values are 'r' (default), 'w' and 'b'.
+        supported mode values are 'r' (default), 'w', 'b', or a combination of
+        those.
         """
         # XXX refactor to share code?
         if not set(mode) <= {"r", "w", "b"}: