[Python-checkins] cpython: Mention the merging of other exceptions into OSError.

[antoine.pitrou]

http://hg.python.org/cpython/rev/6f0af77d4efd
changeset:   72883:6f0af77d4efd
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Oct 12 16:46:46 2011 +0200
summary:
  Mention the merging of other exceptions into OSError.

files:
  Doc/library/exceptions.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -216,6 +216,11 @@
    :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
 

-- 
Repository URL: http://hg.python.org/cpython