diff options
| author | Guido van Rossum <guido@python.org> | 2001-08-10 20:28:28 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-08-10 20:28:28 +0000 |
| commit | 1581c93165431e8a2653fdb78f3b0c30995c0aff (patch) | |
| tree | 29f898079f55ad3558767da69644604442ce3661 /Include/dictobject.h | |
| parent | 731cfdb9c980ad0ddebcd65d91295e5960ba3f6d (diff) | |
| download | cpython-1581c93165431e8a2653fdb78f3b0c30995c0aff.tar.gz | |
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/dictobject.h')
| -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 abc8ed567d..11320214e9 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); |