From: Georg Brandl <georg@python.org>
Date: Sat, 4 Jun 2005 09:20:12 +0000 (+0000)
Subject: Backport bug #1196315: fix weakref.WeakValueDictionary constructor.
X-Git-Tag: v2.4.2c1~203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de09e9571c93cad2eb0a9a6ea161d32ba60de88c;p=thirdparty%2FPython%2Fcpython.git

Backport bug #1196315: fix weakref.WeakValueDictionary constructor.
---

diff --git a/Lib/weakref.py b/Lib/weakref.py
index c0669b03173e..09bd0bee24d6 100644
--- 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 7eba41f9cdd6..28b9c2a87fc8 100644
--- 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.