Merge for issue #25133

This commit is contained in:
Brett Cannon 2015-09-18 15:21:22 -07:00
commit 6631b550d6

View file

@ -50,8 +50,8 @@ Classes hierarchy::
In the following, *events* is a bitwise mask indicating which I/O events should In the following, *events* is a bitwise mask indicating which I/O events should
be waited for on a given file object. It can be a combination of the constants be waited for on a given file object. It can be a combination of the modules
below: constants below:
+-----------------------+-----------------------------------------------+ +-----------------------+-----------------------------------------------+
| Constant | Meaning | | Constant | Meaning |