Commit fa0c8854 authored by Berker Peksag's avatar Berker Peksag

Issue #20100: Merge from 3.5

parents 9af13ca5 1c697a56
......@@ -57,9 +57,7 @@ The module defines the following:
(Only supported on Linux 2.5.44 and newer.) Return an edge polling object,
which can be used as Edge or Level Triggered interface for I/O
events. *sizehint* is deprecated and completely ignored. *flags* can be set
to :const:`EPOLL_CLOEXEC`, which causes the epoll descriptor to be closed
automatically when :func:`os.execve` is called.
events. *sizehint* and *flags* are deprecated and completely ignored.
See the :ref:`epoll-objects` section below for the methods supported by
epolling objects.
......@@ -77,6 +75,10 @@ The module defines the following:
Support for the :keyword:`with` statement was added.
The new file descriptor is now non-inheritable.
.. deprecated:: 3.4
The *flags* parameter. ``select.EPOLL_CLOEXEC`` is used by default now.
Use :func:`os.set_inheritable` to make the file descriptor inheritable.
.. function:: poll()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment