From: Raymond Hettinger <python@rcn.com>
Date: Tue, 3 Mar 2009 22:20:56 +0000 (+0000)
Subject: Fix-up __reduce__ which could not reach the __keys variable indirectly.'
X-Git-Tag: v3.1a1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14b89ffc7e7cf3fb7e65bf6350de2c53554515ea;p=python

Fix-up __reduce__ which could not reach the __keys variable indirectly.'
---

diff --git a/Lib/collections.py b/Lib/collections.py
index 4028983685..a1e8ed975b 100644
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -58,9 +58,13 @@ class OrderedDict(dict, MutableMapping):
 
     def __reduce__(self):
         items = [[k, self[k]] for k in self]
+        tmp = self.__keys
+        del self.__keys
         inst_dict = vars(self).copy()
-        inst_dict.pop('__keys', None)
-        return (self.__class__, (items,), inst_dict)
+        self.__keys = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
 
     setdefault = MutableMapping.setdefault
     update = MutableMapping.update