From 195e702831a3eb9b7c55b30aca24c5d741fd204b Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 12 Oct 2011 16:46:46 +0200 Subject: [PATCH] Mention the merging of other exceptions into OSError. --- Doc/library/exceptions.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 68c9eb1a2a4..67f2c63bdcd 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -216,6 +216,11 @@ The following exceptions are the exceptions that are usually raised. :func:`os.unlink`), the exception instance will contain an additional attribute, :attr:`filename`, which is the file name passed to the function. + .. versionchanged:: 3.3 + :exc:`EnvironmentError`, :exc:`IOError`, :exc:`WindowsError`, + :exc:`VMSError`, :exc:`socket.error`, :exc:`select.error` and + :exc:`mmap.error` have been merged into :exc:`OSError`. + .. exception:: OverflowError