diff options
| author | Guido van Rossum <guido@python.org> | 2007-02-11 06:12:03 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-02-11 06:12:03 (GMT) |
| commit | cc2b0161257495f859200bce0aea3ed7e646feb3 (patch) | |
| tree | ba09aba0de6447bef5be59b43fb86d17d760833d /Modules/cPickle.c | |
| parent | 4e66dfcdc495218ad5f98b12ad6b4b2b05630ab0 (diff) | |
| download | cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.zip cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.tar.gz cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.tar.bz2 | |
- 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.
Diffstat (limited to 'Modules/cPickle.c')
| -rw-r--r-- | Modules/cPickle.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 98ab500..ad2b91f 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); |