[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (#16716)

[andrew.svetlov]

http://hg.python.org/cpython/rev/5ad1d523b342
changeset:   90079:5ad1d523b342
parent:      90077:fb217fc457ca
parent:      90078:f507727c5dd2
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Apr 01 00:41:04 2014 +0300
summary:
  Merge 3.4 (#16716)

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


diff --git a/Doc/library/select.rst b/Doc/library/select.rst
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -377,9 +377,13 @@
 
    Modifies an already registered fd. This has the same effect as
    ``register(fd, eventmask)``.  Attempting to modify a file descriptor
-   that was never registered causes an :exc:`IOError` exception with errno
+   that was never registered causes an :exc:`OSError` exception with errno
    :const:`ENOENT` to be raised.
 
+   .. deprecated:: 3.3
+
+      Instead of :exc:`IOError` the :exc:`OSError` exception is used now.
+
 
 .. method:: poll.unregister(fd)
 

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