[Python-checkins] cpython (3.1): Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
raymond.hettinger
python-checkins at python.org
Tue Apr 19 20:15:34 CEST 2011
http://hg.python.org/cpython/rev/50a89739836f
changeset: 69443:50a89739836f
branch: 3.1
parent: 69412:49e756c8c08b
user: Raymond Hettinger <python at rcn.com>
date: Tue Apr 19 10:05:03 2011 -0700
summary:
Issue 11875: Keep OrderedDict's __reduce__ from temporarily mutating the object.
files:
Lib/collections.py | 5 ++---
Misc/NEWS | 3 +++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Lib/collections.py b/Lib/collections.py
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -101,10 +101,9 @@
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,)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,9 @@
- 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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list