traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.

This commit is contained in:
Raymond Hettinger 2011-04-19 11:10:43 -07:00
parent f97255fd7c 35b873a7b2
commit 1cc986e4a7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/collections.py
View File

@ -154,10 +154,9 @@ class OrderedDict(dict):
def __reduce__(self): def __reduce__(self):
'Return state information for pickling' 'Return state information for pickling'
items = [[k, self[k]] for k in self] items = [[k, self[k]] for k in self]
tmp = self.__map, self.__root, self.__hardroot
del self.__map, self.__root, self.__hardroot
inst_dict = vars(self).copy() inst_dict = vars(self).copy()
self.__map, self.__root, self.__hardroot = tmp for k in vars(self.__class__()):
inst_dict.pop(k, None)
if inst_dict: if inst_dict:
return (self.__class__, (items,), inst_dict) return (self.__class__, (items,), inst_dict)
return self.__class__, (items,) return self.__class__, (items,)

3
Misc/NEWS
View File

@ -68,6 +68,9 @@ Library
- Issue #11852: Add missing imports and update tests. - Issue #11852: Add missing imports and update tests.
- Issue #11875: collections.OrderedDict's __reduce__ was temporarily
mutating the object instead of just working on a copy.
- Issue #11467: Fix urlparse behavior when handling urls which contains scheme - Issue #11467: Fix urlparse behavior when handling urls which contains scheme
specific part only digits. Patch by Santoso Wijaya. specific part only digits. Patch by Santoso Wijaya.