[Zope-Checkins] CVS: Zope/lib/python/OFS - CopySupport.py:1.75.6.1 DTMLMethod.py:1.70.2.1

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv13509/lib/python/OFS

Modified Files:
      Tag: ajung-webdav-debug
	CopySupport.py DTMLMethod.py 
Log Message:
merge from trunk


=== Zope/lib/python/OFS/CopySupport.py 1.75 => 1.75.6.1 ===
 from AccessControl import getSecurityManager
 from Acquisition import aq_base, aq_inner, aq_parent
-
+from zExceptions import Unauthorized
 
 CopyError='Copy Error'
 


=== Zope/lib/python/OFS/DTMLMethod.py 1.70 => 1.70.2.1 ===
         security=getSecurityManager()
         security.addContext(self)
-        self.__dict__['validate'] = security.DTMLValidate
+        if self.__dict__.has_key('validate'):
+            first_time_through = 0
+        else:
+            self.__dict__['validate'] = security.DTMLValidate
+            first_time_through = 1
         try:
         
             if client is None:
@@ -200,8 +204,8 @@
 
         finally:
             security.removeContext(self)
-            try: del self.__dict__['validate']
-            except: pass
+            if first_time_through:
+                del self.__dict__['validate']
 
         have_key=RESPONSE.headers.has_key
         if not (have_key('content-type') or have_key('Content-Type')):