From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 12 Oct 2011 14:46:46 +0000 (+0200)
Subject: Mention the merging of other exceptions into OSError.
X-Git-Tag: v3.3.0a1~1204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=195e702831a3eb9b7c55b30aca24c5d741fd204b;p=thirdparty%2FPython%2Fcpython.git

Mention the merging of other exceptions into OSError.
---

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 68c9eb1a2a4b..67f2c63bdcd1 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