From: Hugo van Kemenade Date: Sat, 9 Sep 2023 09:34:18 +0000 (-0600) Subject: [3.11] gh-107924: re-order os.sendfile() flag documentation (#107926) (#109178) X-Git-Tag: v3.11.6~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77356f6f9607b1e9700f988912ad70ecaef024cc;p=thirdparty%2FPython%2Fcpython.git [3.11] gh-107924: re-order os.sendfile() flag documentation (#107926) (#109178) Co-authored-by: Hugo van Kemenade Co-authored-by: Christoph Anton Mitterer --- diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 38024f78f4f0..75ffee0b8e3c 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1508,21 +1508,6 @@ or `the MSDN `_ on Windo Parameters *out* and *in* was renamed to *out_fd* and *in_fd*. -.. function:: set_blocking(fd, blocking, /) - - Set the blocking mode of the specified file descriptor. Set the - :data:`O_NONBLOCK` flag if blocking is ``False``, clear the flag otherwise. - - See also :func:`get_blocking` and :meth:`socket.socket.setblocking`. - - .. availability:: Unix. - - The function is limited on Emscripten and WASI, see - :ref:`wasm-availability` for more information. - - .. versionadded:: 3.5 - - .. data:: SF_NODISKIO SF_MNOWAIT SF_SYNC @@ -1544,6 +1529,21 @@ or `the MSDN `_ on Windo .. versionadded:: 3.11 +.. function:: set_blocking(fd, blocking, /) + + Set the blocking mode of the specified file descriptor. Set the + :data:`O_NONBLOCK` flag if blocking is ``False``, clear the flag otherwise. + + See also :func:`get_blocking` and :meth:`socket.socket.setblocking`. + + .. availability:: Unix. + + The function is limited on Emscripten and WASI, see + :ref:`wasm-availability` for more information. + + .. versionadded:: 3.5 + + .. function:: splice(src, dst, count, offset_src=None, offset_dst=None) Transfer *count* bytes from file descriptor *src*, starting from offset