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.

1 files changed, 2 insertions, 8 deletions

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 3b922a9..e843e76 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -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)
 {