diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-04-19 17:05:03 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-04-19 17:05:03 (GMT) |
| commit | d08a2c2576457b7d0229a00b4977044a38ad0d68 (patch) | |
| tree | 2b9cd896eecc872a675abee46ef4158fedf39a72 | |
| parent | 2876a8c272ec9fd7ddd9fec62676bc61ba947747 (diff) | |
| download | cpython-d08a2c2576457b7d0229a00b4977044a38ad0d68.zip cpython-d08a2c2576457b7d0229a00b4977044a38ad0d68.tar.gz cpython-d08a2c2576457b7d0229a00b4977044a38ad0d68.tar.bz2 | |
Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
| -rw-r--r-- | Lib/collections.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/collections.py b/Lib/collections.py index fb9464f..9381f51 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -101,10 +101,9 @@ class OrderedDict(dict): def __reduce__(self): 'Return state information for pickling' items = [[k, self[k]] for k in self] - tmp = self.__map, self.__root, self.__in_repr - del self.__map, self.__root, self.__in_repr inst_dict = vars(self).copy() - self.__map, self.__root, self.__in_repr = tmp + for k in vars(self.__class__()): + inst_dict.pop(k, None) if inst_dict: return (self.__class__, (items,), inst_dict) return self.__class__, (items,) @@ -58,6 +58,9 @@ Library - Issue #11467: Fix urlparse behavior when handling urls which contains scheme specific part only digits. Patch by Santoso Wijaya. +- Issue #11875: collections.OrderedDict's __reduce__ was temporarily + mutating the object instead of just working on a copy. + - collections.Counter().copy() now works correctly for subclasses. - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. |