summaryrefslogtreecommitdiffstats
path: root/Doc/library/exceptions.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-10-12 14:46:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-10-12 14:46:46 (GMT)
commit195e702831a3eb9b7c55b30aca24c5d741fd204b (patch)
treee9b70fd2f3d51977a3acfde330a8e3846f9628b9 /Doc/library/exceptions.rst
parent9b7fcf8c2e3a64735c72fe319141a0e76458dfbb (diff)
downloadcpython-195e702831a3eb9b7c55b30aca24c5d741fd204b.zip
cpython-195e702831a3eb9b7c55b30aca24c5d741fd204b.tar.gz
cpython-195e702831a3eb9b7c55b30aca24c5d741fd204b.tar.bz2
Mention the merging of other exceptions into OSError.
Diffstat (limited to 'Doc/library/exceptions.rst')
-rw-r--r--Doc/library/exceptions.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 68c9eb1..67f2c63 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