diff options
| author | Guido van Rossum <guido@python.org> | 2001-08-10 20:28:28 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-08-10 20:28:28 (GMT) |
| commit | 05ac6de2d505b0cd69278e05be8bad3f0111e72d (patch) | |
| tree | fb7c671d094e9bd9fb4fe5c9677846e3cc6a6fdd /Include | |
| parent | f4aa684132a2752118af9a2412f0acc90c258035 (diff) | |
| download | cpython-05ac6de2d505b0cd69278e05be8bad3f0111e72d.zip cpython-05ac6de2d505b0cd69278e05be8bad3f0111e72d.tar.gz cpython-05ac6de2d505b0cd69278e05be8bad3f0111e72d.tar.bz2 | |
Add PyDict_Merge(a, b, override):
PyDict_Merge(a, b, 1) is the same as PyDict_Update(a, b).
PyDict_Merge(a, b, 0) does something similar but leaves existing items
unchanged.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/dictobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/dictobject.h b/Include/dictobject.h index abc8ed5..1132021 100644 --- a/Include/dictobject.h +++ b/Include/dictobject.h @@ -98,6 +98,7 @@ extern DL_IMPORT(PyObject *) PyDict_Items(PyObject *mp); extern DL_IMPORT(int) PyDict_Size(PyObject *mp); extern DL_IMPORT(PyObject *) PyDict_Copy(PyObject *mp); extern DL_IMPORT(int) PyDict_Update(PyObject *mp, PyObject *other); +extern DL_IMPORT(int) PyDict_Merge(PyObject *mp, PyObject *other, int override); extern DL_IMPORT(PyObject *) PyDict_GetItemString(PyObject *dp, char *key); |