[Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.118,2.119
Tim Peters
tim_one@users.sourceforge.net
2001年12月11日 10:51:10 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv2320/python/Objects
Modified Files:
dictobject.c
Log Message:
SF bug #491415 PyDict_UpdateFromSeq2() unused
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.
Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.118
retrieving revision 2.119
diff -C2 -d -r2.118 -r2.119
*** dictobject.c 2001年12月03日 16:32:18 2.118
--- dictobject.c 2001年12月11日 18:51:08 2.119
***************
*** 998,1006 ****
PyDict_{Update,Merge} update/merge from a mapping object.
! PyDict_{Update,Merge}FromSeq2 update/merge from any iterable object
producing iterable objects of length 2.
*/
! static int
PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
{
--- 998,1006 ----
PyDict_{Update,Merge} update/merge from a mapping object.
! PyDict_MergeFromSeq2 updates/merges from any iterable object
producing iterable objects of length 2.
*/
! int
PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
{
***************
*** 1070,1079 ****
Py_DECREF(it);
return i;
- }
-
- static int
- PyDict_UpdateFromSeq2(PyObject *d, PyObject *seq2)
- {
- return PyDict_MergeFromSeq2(d, seq2, 1);
}
--- 1070,1073 ----