diff Objects/typeobject.c @ 40809:f340cb045bf9

- 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.
author Guido van Rossum <guido@python.org>
date Sun, 11 Feb 2007 06:12:03 +0000
parents 6ebad2a6b990
children 32c4897b5d46
line wrap: on
line diff
--- a/Objects/typeobject.c	Sat Feb 10 22:53:17 2007 +0000
+++ b/Objects/typeobject.c	Sun Feb 11 06:12:03 2007 +0000
@@ -2601,7 +2601,11 @@
 		Py_INCREF(dictitems);
 	}
 	else {
-		dictitems = PyObject_CallMethod(obj, "iteritems", "");
+		PyObject *items = PyObject_CallMethod(obj, "items", "");
+		if (items == NULL)
+			goto end;
+		dictitems = PyObject_GetIter(items);
+		Py_DECREF(items);
 		if (dictitems == NULL)
 			goto end;
 	}