mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

SF bug #491415 PyDict_UpdateFromSeq2() unused

Browse source 
PyDict_UpdateFromSeq2():  removed it.
PyDict_MergeFromSeq2():  made it public and documented it.
PyDict_Merge() docs:  updated to reveal <wink> that the second
argument can be any mapping object.
This commit is contained in:
Tim Peters 2001-12-11 18:51:08 +00:00
parent c82bd7281f
commit f582b82fe9
4 changed files with 70 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/dictobject.c
View file

@ -997,11 +997,11 @@ dict_update(PyObject *mp, PyObject *other)
PyDict_{Update,Merge} update/merge from a mapping object.
PyDict_{Update,Merge}FromSeq2 update/merge from any iterable object
PyDict_MergeFromSeq2 updates/merges from any iterable object
producing iterable objects of length 2.
*/
static int
int
PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
{
PyObject *it; /* iter(seq2) */
@ -1071,12 +1071,6 @@ Return:
return i;
}
static int
PyDict_UpdateFromSeq2(PyObject *d, PyObject *seq2)
{
return PyDict_MergeFromSeq2(d, seq2, 1);
}
int
PyDict_Update(PyObject *a, PyObject *b)
{