diff options
author | Guido van Rossum <guido@python.org> | 2007-02-11 06:12:03 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-02-11 06:12:03 +0000 |
commit | cc2b0161257495f859200bce0aea3ed7e646feb3 (patch) | |
tree | ba09aba0de6447bef5be59b43fb86d17d760833d /Lib/copy.py | |
parent | Random change to make this work unchanged when dict.keys() returns a dict view. (diff) | |
download | cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.tar.gz cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.tar.bz2 cpython-cc2b0161257495f859200bce0aea3ed7e646feb3.zip |
- 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 'Lib/copy.py')
-rw-r--r-- | Lib/copy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/copy.py b/Lib/copy.py index 37e35cf93a7..9bc794aefc0 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -230,7 +230,7 @@ d[tuple] = _deepcopy_tuple def _deepcopy_dict(x, memo): y = {} memo[id(x)] = y - for key, value in x.iteritems(): + for key, value in x.items(): y[deepcopy(key, memo)] = deepcopy(value, memo) return y d[dict] = _deepcopy_dict @@ -302,7 +302,7 @@ def _reconstruct(x, info, deep, memo=None): if state is not None: y.__dict__.update(state) if slotstate is not None: - for key, value in slotstate.iteritems(): + for key, value in slotstate.items(): setattr(y, key, value) return y @@ -337,7 +337,7 @@ def _test(): def __getstate__(self): return {'a': self.a, 'arg': self.arg} def __setstate__(self, state): - for key, value in state.iteritems(): + for key, value in state.items(): setattr(self, key, value) def __deepcopy__(self, memo=None): new = self.__class__(deepcopy(self.arg, memo)) |