Merged revisions 82879,82958-82959,83109,83127,83224,83747,84162 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82879 | stefan.krah | 2010-07-14 12:16:11 +0200 (Mi, 14 Jul 2010) | 3 lines High byte is the exit status. ........ r82958 | jean-paul.calderone | 2010-07-18 18:13:27 +0200 (So, 18 Jul 2010) | 1 line There is no method named "register(fd, eventmask)"; fix markup to just indicate this is code. ........ r82959 | jean-paul.calderone | 2010-07-18 18:30:31 +0200 (So, 18 Jul 2010) | 1 line Document the extra epoll flags ........ r83109 | brett.cannon | 2010-07-23 18:58:21 +0200 (Fr, 23 Jul 2010) | 4 lines Mention in the fnmatch docs that meta-characters in translate cannot be quoted. Closes issue 9358. Thanks to Brian Brazil for the patch. ........ r83127 | martin.v.loewis | 2010-07-24 12:09:11 +0200 (Sa, 24 Jul 2010) | 2 lines Put listdir default argument into declaration. ........ r83224 | mark.dickinson | 2010-07-29 15:56:56 +0200 (Do, 29 Jul 2010) | 1 line Fix typo. ........ r83747 | gerhard.haering | 2010-08-06 08:12:05 +0200 (Fr, 06 Aug 2010) | 2 lines Issue #3854: Documented using the sqlite3 module with multiple threads. ........ r84162 | victor.stinner | 2010-08-18 00:01:02 +0200 (Mi, 18 Aug 2010) | 3 lines Replace :func: by :cfunc: To get links to the C functions ........
This commit is contained in:
parent
aea70af06f
commit
a04b03b899
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in New Issue