[Jython-checkins] SF.net SVN: jython:[6585] trunk/jython/Lib/weakref.py

[<pj...@us...>]

Revision: 6585
          http://jython.svn.sourceforge.net/jython/?rev=6585&view=rev
Author:   pjenvey
Date:     2009-07-25 22:34:45 +0000 (Sat, 25 Jul 2009)

Log Message:
-----------
quiet KeyErrors triggered during weakref callbacks. these don't seem to happen
on the ref counting GC because the ref is always collected before the callback
can be triggered

Modified Paths:
--------------
    trunk/jython/Lib/weakref.py

Modified: trunk/jython/Lib/weakref.py
===================================================================
--- trunk/jython/Lib/weakref.py	2009-07-25 22:16:39 UTC (rev 6584)
+++ trunk/jython/Lib/weakref.py	2009-07-25 22:34:45 UTC (rev 6585)
@@ -46,7 +46,10 @@
         def remove(wr, selfref=ref(self)):
             self = selfref()
             if self is not None:
-                del self.data[wr.key]
+                try:
+                    del self.data[wr.key]
+                except KeyError:
+                    pass
         self._remove = remove
         UserDict.UserDict.__init__(self, *args, **kw)
 
@@ -232,7 +235,10 @@
         def remove(k, selfref=ref(self)):
             self = selfref()
             if self is not None:
-                del self.data[k]
+                try:
+                    del self.data[k]
+                except KeyError:
+                    pass
         self._remove = remove
         if dict is not None: self.update(dict)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.