diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-08-17 22:01:02 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-08-17 22:01:02 (GMT) |
| commit | 6009ece0ede4a2a39b3cfe15d53fed9e33422276 (patch) | |
| tree | 27ba04aa4e96c821062225a2f04c34541b26183d /Doc/c-api/dict.rst | |
| parent | f5be090bc3fafe10d699716cbe25800b5b69fa6d (diff) | |
| download | cpython-6009ece0ede4a2a39b3cfe15d53fed9e33422276.zip cpython-6009ece0ede4a2a39b3cfe15d53fed9e33422276.tar.gz cpython-6009ece0ede4a2a39b3cfe15d53fed9e33422276.tar.bz2 | |
Replace :func: by :cfunc:
To get links to the C functions
Diffstat (limited to 'Doc/c-api/dict.rst')
| -rw-r--r-- | Doc/c-api/dict.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst index 89db16e..4b966fb 100644 --- a/Doc/c-api/dict.rst +++ b/Doc/c-api/dict.rst @@ -190,8 +190,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. |