- PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone;

  and .keys(), .items(), .values() return dict views.

The dict views aren't fully functional yet; in particular, they can't
be compared to sets yet.  but they are useful as "iterator wells".

There are still 27 failing unit tests; I expect that many of these
have fairly trivial fixes, but there are so many, I could use help.

2 files changed, 16 insertions, 5 deletions

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 98ab500aa3..ad2b91fee5 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -1752,7 +1752,7 @@ save_dict(Picklerobject *self, PyObject *args)
 	int res = -1;
 	char s[3];
 	int len;
-	PyObject *iter;
+	PyObject *items, *iter;
 
 	if (self->fast && !fast_save_enter(self, args))
 		goto finally;
@@ -1784,7 +1784,11 @@ save_dict(Picklerobject *self, PyObject *args)
 		goto finally;
 
 	/* Materialize the dict items. */
-	iter = PyObject_CallMethod(args, "iteritems", "()");
+	items = PyObject_CallMethod(args, "items", "()");
+	if (items == NULL)
+		goto finally;
+	iter = PyObject_GetIter(items);
+	Py_DECREF(items);
 	if (iter == NULL)
 		goto finally;
 	res = batch_dict(self, iter);
diff --git a/Modules/collectionsmodule.c b/Modules/collectionsmodule.c
index 9fff7f0896..f75e1a320a 100644
--- a/Modules/collectionsmodule.c
+++ b/Modules/collectionsmodule.c
@@ -1140,6 +1140,7 @@ defdict_reduce(defdictobject *dd)
 	*/
 	PyObject *args;
 	PyObject *items;
+	PyObject *iteritems;
 	PyObject *result;
 	if (dd->default_factory == NULL || dd->default_factory == Py_None)
 		args = PyTuple_New(0);
@@ -1147,14 +1148,20 @@ defdict_reduce(defdictobject *dd)
 		args = PyTuple_Pack(1, dd->default_factory);
 	if (args == NULL)
 		return NULL;
-	items = PyObject_CallMethod((PyObject *)dd, "iteritems", "()");
+	items = PyObject_CallMethod((PyObject *)dd, "items", "()");
 	if (items == NULL) {
 		Py_DECREF(args);
 		return NULL;
 	}
-	result = PyTuple_Pack(5, dd->dict.ob_type, args,
-			      Py_None, Py_None, items);
+	iteritems = PyObject_GetIter(items);
 	Py_DECREF(items);
+	if (iteritems == NULL) {
+		Py_DECREF(args);
+		return NULL;
+	}
+	result = PyTuple_Pack(5, dd->dict.ob_type, args,
+			      Py_None, Py_None, iteritems);
+	Py_DECREF(iteritems);
 	Py_DECREF(args);
 	return result;
 }