[Zope-Checkins] CVS: Zope2 - DT_Util.py:1.72.18.9

shane@digicool.com shane@digicool.com
Fri, 27 Apr 2001 15:46:59 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/DocumentTemplate
In directory korak:/tmp/cvs-serv14446

Modified Files:
      Tag: RestrictedPythonBranch
	DT_Util.py 
Log Message:
Matched render() with correct callable() semantics



--- Updated File DT_Util.py in package Zope2 --
--- DT_Util.py	2001/04/27 15:17:04	1.72.18.8
+++ DT_Util.py	2001/04/27 19:46:58	1.72.18.9
@@ -176,10 +176,14 @@
     else:
         vbase = getattr(v, 'aq_base', v)
         if callable(vbase):
-            if getattr(vbase, 'isDocTemp', 0):
-                v = v(None, self)
-            else:
-                v = v()
+            try:
+                if getattr(vbase, 'isDocTemp', 0):
+                    v = v(None, self)
+                else:
+                    v = v()
+            except AttributeError, n:
+                if n != '__call__':
+                    raise
     return v
 
 d['render']=render