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

[Florent Guillaume]

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

Modified Files:
      Tag: CMF-1_3-branch
	MemberDataTool.py 
Log Message:
Merge from HEAD:
It's really KeyError that's raised (ExtensionClass peculiarity).


=== CMF/CMFCore/MemberDataTool.py 1.15.8.5 => 1.15.8.6 ===
--- CMF/CMFCore/MemberDataTool.py:1.15.8.5	Thu Apr  3 12:11:46 2003
+++ CMF/CMFCore/MemberDataTool.py	Thu Apr  3 15:47:26 2003
@@ -195,7 +195,7 @@
     def __del__(self):
         try:
             del self._tool._v_temps
-        except AttributeError:
+        except (AttributeError, KeyError):
             # The object has already been deactivated.
             pass