diff options
| -rw-r--r-- | Doc/c-api/dict.rst | 4 | ||||
| -rw-r--r-- | Doc/library/fnmatch.rst | 2 | ||||
| -rw-r--r-- | Doc/library/select.rst | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst index ed07f66..066e7f1 100644 --- a/Doc/c-api/dict.rst +++ b/Doc/c-api/dict.rst @@ -199,8 +199,8 @@ Dictionary Objects .. cfunction:: int PyDict_Merge(PyObject *a, PyObject *b, int override) Iterate over mapping object *b* adding key-value pairs to dictionary *a*. - *b* may be a dictionary, or any object supporting :func:`PyMapping_Keys` - and :func:`PyObject_GetItem`. If *override* is true, existing pairs in *a* + *b* may be a dictionary, or any object supporting :cfunc:`PyMapping_Keys` + and :cfunc:`PyObject_GetItem`. If *override* is true, existing pairs in *a* will be replaced if a matching key is found in *b*, otherwise pairs will only be added if there is not a matching key in *a*. Return ``0`` on success or ``-1`` if an exception was raised. diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst index 67aa2f4..3d41726 100644 --- a/Doc/library/fnmatch.rst +++ b/Doc/library/fnmatch.rst @@ -73,6 +73,8 @@ patterns. Return the shell-style *pattern* converted to a regular expression. + Be aware there is no way to quote meta-characters. + Example: >>> import fnmatch, re diff --git a/Doc/library/select.rst b/Doc/library/select.rst index f3d84e0..2e08b74 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -138,15 +138,15 @@ Edge and Level Trigger Polling (epoll) Objects | :const:`EPOLLONESHOT` | Set one-shot behavior. After one event is | | | pulled out, the fd is internally disabled | +-----------------------+-----------------------------------------------+ - | :const:`EPOLLRDNORM` | ??? | + | :const:`EPOLLRDNORM` | Equivalent to :const:`EPOLLIN` | +-----------------------+-----------------------------------------------+ - | :const:`EPOLLRDBAND` | ??? | + | :const:`EPOLLRDBAND` | Priority data band can be read. | +-----------------------+-----------------------------------------------+ - | :const:`EPOLLWRNORM` | ??? | + | :const:`EPOLLWRNORM` | Equivalent to :const:`EPOLLOUT` | +-----------------------+-----------------------------------------------+ - | :const:`EPOLLWRBAND` | ??? | + | :const:`EPOLLWRBAND` | Priority data may be written. | +-----------------------+-----------------------------------------------+ - | :const:`EPOLLMSG` | ??? | + | :const:`EPOLLMSG` | Ignored. | +-----------------------+-----------------------------------------------+ @@ -240,7 +240,7 @@ linearly scanned again. :cfunc:`select` is O(highest file descriptor), while .. method:: poll.modify(fd, eventmask) Modifies an already registered fd. This has the same effect as - :meth:`register(fd, eventmask)`. Attempting to modify a file descriptor + ``register(fd, eventmask)``. Attempting to modify a file descriptor that was never registered causes an :exc:`IOError` exception with errno :const:`ENOENT` to be raised. |