Fix SF bug #529273: WeakValueDictionary.setdefault() raised UnboundLocalError

since it used the name of a global function as the name of a local.  The
patch is almost identical to that submitted with the bug report.

diff --git a/Lib/weakref.py b/Lib/weakref.py
index b6b45282d06582ca7d9cbf49ede1967a1a2b7741..7696c0fcb23ee005e85a6e5d72447925c579aa97 100644 (file)
--- a/Lib/weakref.py
+++ b/Lib/weakref.py
@@ -84,15 +84,14 @@ class WeakValueDictionary(UserDict.UserDict):
 
     def setdefault(self, key, default):
         try:
-            ref = self.data[key]
+            wr = self.data[key]
         except KeyError:
             def remove(o, data=self.data, key=key):
                 del data[key]
-            ref = ref(default, remove)
-            self.data[key] = ref
+            self.data[key] = ref(default, remove)
             return default
         else:
-            return ref()
+            return wr()
 
     def update(self, dict):
         d = self.data