From 9c7d1558f884c9df8904a8474e67c3b61e30c68e Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Mon, 9 May 2022 09:18:34 +0100 Subject: [PATCH 1/2] gh-92417: `chunk` docs, `socket` docs: remove references to Python <3.3 --- Doc/library/chunk.rst | 3 +-- Doc/library/socket.rst | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Doc/library/chunk.rst b/Doc/library/chunk.rst index 7999420f536d76..f15ce2db4cfb01 100644 --- a/Doc/library/chunk.rst +++ b/Doc/library/chunk.rst @@ -94,8 +94,7 @@ instance will fail with an :exc:`EOFError` exception. underlying file. The remaining methods will raise :exc:`OSError` if called after the - :meth:`close` method has been called. Before Python 3.3, they used to - raise :exc:`IOError`, now an alias of :exc:`OSError`. + :meth:`close` method has been called. .. method:: isatty() diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index ee1aee5278b3be..c27f408890ac32 100755 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -233,9 +233,9 @@ resolution and/or the host configuration. For deterministic behavior use a numeric address in *host* portion. All errors raise exceptions. The normal exceptions for invalid argument types -and out-of-memory conditions can be raised; starting from Python 3.3, errors +and out-of-memory conditions can be raised. Errors related to socket or address semantics raise :exc:`OSError` or one of its -subclasses (they used to raise :exc:`socket.error`). +subclasses. Non-blocking mode is supported through :meth:`~socket.setblocking`. A generalization of this based on timeouts is supported through From 436e9b59d38a65640aded4e3d018bcae685650b4 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Tue, 10 May 2022 12:10:58 +0100 Subject: [PATCH 2/2] Revert changes to `chunk.rst` --- Doc/library/chunk.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/library/chunk.rst b/Doc/library/chunk.rst index f15ce2db4cfb01..7999420f536d76 100644 --- a/Doc/library/chunk.rst +++ b/Doc/library/chunk.rst @@ -94,7 +94,8 @@ instance will fail with an :exc:`EOFError` exception. underlying file. The remaining methods will raise :exc:`OSError` if called after the - :meth:`close` method has been called. + :meth:`close` method has been called. Before Python 3.3, they used to + raise :exc:`IOError`, now an alias of :exc:`OSError`. .. method:: isatty()