[ZPT] CVS: Releases/Zope/lib/python/Products/PageTemplates - PageTemplateFile.py:1.9.16.1 TALES.py:1.27.10.1

[Evan Simpson]

Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv16718/Products/PageTemplates

Modified Files:
      Tag: Zope-2_5-branch
	PageTemplateFile.py TALES.py 
Log Message:
Fixed PageTemplateFile security, and merged error message fixed from trunk.


=== Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.9 => 1.9.16.1 ===
 
     security = AccessControl.ClassSecurityInfo()
-    security.declareObjectProtected('View')
-    security.declareProtected('View', '__call__')
     security.declareProtected('View management screens',
       'read', 'document_src')
 


=== Releases/Zope/lib/python/Products/PageTemplates/TALES.py 1.27 => 1.27.10.1 ===
         return s
     def __nonzero__(self):
-        return 0
+        return 1
 
 class Undefined(TALESError):
     '''Exception raised on traversal of an undefined path'''
@@ -245,10 +245,6 @@
             expression = self._engine.compile(expression)
         try:
             v = expression(self)
-            if isinstance(v, Exception):
-                if isinstance(v, TALESError):
-                    raise v, None, v.takeTraceback()
-                raise v
         except TALESError, err:
             err.setPosition(self.position)
             raise err, None, sys.exc_info()[2]