[Zope-Checkins] CVS: Zope/lib/python/OFS - DTMLMethod.py:1.67.2.3

Matthew T. Kromer matt@zope.com
Fri, 26 Oct 2001 10:40:56 -0400


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

Modified Files:
      Tag: Zope-2_4-branch
	DTMLMethod.py 
Log Message:
Update DTMLMethod to not complain if the security validation accelerator
attribute is already removed (from exit on recursive entry).


=== Zope/lib/python/OFS/DTMLMethod.py 1.67.2.2 => 1.67.2.3 ===
         finally:
             security.removeContext(self)
-            del self.__dict__['validate']
+            try: del self.__dict__['validate']
+            except: pass
 
         have_key=RESPONSE.headers.has_key
         if not (have_key('content-type') or have_key('Content-Type')):
@@ -213,6 +214,9 @@
         if not self._cache_namespace_keys:
             self.ZCacheable_set(result)
         return result
+
+    def validate(self, inst, parent, name, value, md=None):
+        return getSecurityManager().validate(inst, parent, name, value)
 
     def ZDocumentTemplate_beforeRender(self, md, default):
         # Tries to get a cached value.