Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty parameters.

pitrou · pitrou · commit c06de477a356 · 2009-05-30T21:04:26.000Z
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
@@ -942,6 +942,17 @@ def make_weak_keyed_dict(self):
             dict[o] = o.arg
         return dict, objects
 
+    def test_make_weak_valued_dict_from_dict(self):
+        o = Object(3)
+        dict = weakref.WeakValueDictionary({364:o})
+        self.assertEqual(dict[364], o)
+
+    def test_make_weak_valued_dict_from_weak_valued_dict(self):
+        o = Object(3)
+        dict = weakref.WeakValueDictionary({364:o})
+        dict2 = weakref.WeakValueDictionary(dict)
+        self.assertEqual(dict[364], o)
+
     def make_weak_valued_dict(self):
         dict = weakref.WeakValueDictionary()
         objects = list(map(Object, range(self.COUNT)))
diff --git a/Lib/weakref.py b/Lib/weakref.py
@@ -49,7 +49,7 @@ def remove(wr, selfref=ref(self)):
                 del self.data[wr.key]
         self._remove = remove
         self.data = d = {}
-        d.update(*args, **kw)
+        self.update(*args, **kw)
 
     def __getitem__(self, key):
         o = self.data[key]()
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty
+  parameters.
+
 
 What's New in Python 3.1 release candidate 1?
 =============================================
