diff options
author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2014-03-31 21:41:04 (GMT) |
---|---|---|
committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2014-03-31 21:41:04 (GMT) |
commit | a4dae7e6abb9d66124e39acf9b6981e248ea32f6 (patch) | |
tree | 982adde8ef5b3b77b7fb5edc8d851e77bf26395b | |
parent | 3fec24ef135c947de7538c1c0495115eea3035c9 (diff) | |
parent | 050f9ea4d7e20634b6405006870dd5b0de9cb0aa (diff) | |
download | cpython-a4dae7e6abb9d66124e39acf9b6981e248ea32f6.zip cpython-a4dae7e6abb9d66124e39acf9b6981e248ea32f6.tar.gz cpython-a4dae7e6abb9d66124e39acf9b6981e248ea32f6.tar.bz2 |
Merge 3.4 (#16716)
-rw-r--r-- | Doc/library/select.rst | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/library/select.rst b/Doc/library/select.rst index 4fae87e..4bf1a9f 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -377,9 +377,13 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while 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) |