[ZPT] CVS: Products/PageTemplates - CHANGES.txt:1.18 HISTORY.txt:1.4 PageTemplate.py:1.14 TALES.py:1.21 ZopePageTemplate.py:1.17

[Evan Simpson]

Update of /cvs-repository/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv29534

Modified Files:
	CHANGES.txt HISTORY.txt PageTemplate.py TALES.py 
	ZopePageTemplate.py 
Log Message:
Merge fixes from 1.4.0 branch


=== Products/PageTemplates/CHANGES.txt 1.17 => 1.18 ===
   file HISTORY.txt.
 
-    Version 1.4.0
-
-      Features Added
-
-        - ZPTs are now cache-enabled
-
-        - Added property sheet to ZPT
+    Version 1.4.1
 
       Bugs Fixed
 
-        - Expressions with embedded newlines were broken
-
-        - History comparison tried to expand macros
-
-        - Iterator exceptions weren't converted
-
-        - 'Unauthorized' exception couldn't be handled by on-error
+        - Tracebacks were often truncated.


=== Products/PageTemplates/HISTORY.txt 1.3 => 1.4 ===
   in the file CHANGES.txt.
 
+    Version 1.4.0
+
+      Features Added
+
+        - ZPTs are now cache-enabled
+
+        - Added property sheet to ZPT
+
+      Bugs Fixed
+
+        - Expressions with embedded newlines were broken
+
+        - History comparison tried to expand macros
+
+        - Iterator exceptions weren't converted
+
+        - 'Unauthorized' exception couldn't be handled by on-error
+
     Version 1.3.3
 
       Features Added


=== Products/PageTemplates/PageTemplate.py 1.13 => 1.14 ===
         return parent._v_macros
 
-class PageTemplate:
+class PageTemplate(Base):
     "Page Templates using TAL, TALES, and METAL"
      
     content_type = 'text/html'


=== Products/PageTemplates/TALES.py 1.20 => 1.21 ===
             v = expression(self)
             if isinstance(v, Exception):
+                if hasattr(v, 'traceback'):
+                    raise v, None, v.traceback
                 raise v
         except self._nocatch:
             raise


=== Products/PageTemplates/ZopePageTemplate.py 1.16 => 1.17 ===
             except TALESError, err:
                 if err.type == 'Unauthorized':
-                    raise err.type, err.value
+                    raise err.type, err.value, err.traceback
                 raise
             if keyset is not None:
                 # Store the result in the cache.