Backport bug #1196315: fix weakref.WeakValueDictionary constructor.

diff --git a/Lib/weakref.py b/Lib/weakref.py
index c0669b03173e5ec46f3e318ca23431c40308d703..09bd0bee24d6feadfcc080c5d6f214b7f882541d 100644 (file)
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -43,12 +43,12 @@ class WeakValueDictionary(UserDict.UserDict):
     # way in).
 
     def __init__(self, *args, **kw):
-        UserDict.UserDict.__init__(self, *args, **kw)
         def remove(wr, selfref=ref(self)):
             self = selfref()
             if self is not None:
                 del self.data[wr.key]
         self._remove = remove
+        UserDict.UserDict.__init__(self, *args, **kw)
 
     def __getitem__(self, key):
         o = self.data[key]()

diff --git a/Misc/NEWS b/Misc/NEWS
index 7eba41f9cdd6b1058de4a393c8d75cd9c6b2072e..28b9c2a87fc8c898eb16971e0abb7cb55b7339f3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,8 @@ Extension Modules
 Library
 -------
 
+- Bug #1196315: fix weakref.WeakValueDictionary constructor.
+
 - Bug #1213894: os.path.realpath didn't resolve symlinks that were the first
   component of the path.