Commit 019a97c7 authored by Raymond Hettinger's avatar Raymond Hettinger

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

parent c15d9e75
...@@ -154,10 +154,9 @@ class OrderedDict(dict): ...@@ -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,)
......
...@@ -62,6 +62,9 @@ Library ...@@ -62,6 +62,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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment