[CMF-checkins] CVS: CMF/CMFCore - MemberDataTool.py:1.15.8.5

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv2278

Modified Files:
      Tag: CMF-1_3-branch
	MemberDataTool.py 
Log Message:
Merge from HEAD:
Correctly treat the case where the object has already been deactivated
by the time cleanup is done.


=== CMF/CMFCore/MemberDataTool.py 1.15.8.4 => 1.15.8.5 ===
--- CMF/CMFCore/MemberDataTool.py:1.15.8.4	Fri Mar 14 12:40:32 2003
+++ CMF/CMFCore/MemberDataTool.py	Thu Apr  3 12:11:46 2003
@@ -193,7 +193,11 @@
     def __init__(self, tool):
         self._tool = tool
     def __del__(self):
-        del self._tool._v_temps
+        try:
+            del self._tool._v_temps
+        except AttributeError:
+            # The object has already been deactivated.
+            pass
 
 
 class MemberData (SimpleItem):