[Zope-Checkins] CVS: Zope3/lib/python/Zope/PageTemplate - PageTemplate.py:1.1.2.14

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/lib/python/Zope/PageTemplate
In directory cvs.zope.org:/tmp/cvs-serv18071

Modified Files:
      Tag: Zope-3x-branch
	PageTemplate.py 
Log Message:
Simlify the PageTemplateTracebackSupplement: do not protect against exceptions
where that is already done in the code being called.


=== Zope3/lib/python/Zope/PageTemplate/PageTemplate.py 1.1.2.13 => 1.1.2.14 ===
         try:
             w = pt.pt_warnings()
-            e = pt.pt_errors()
-            if e:
-                if w:
-                    w = list(w) + list(e)
-                else:
-                    w = e
         except: # We're already trying to report an error, don't make another.
-            w = None
+            w = ()
+        e = pt.pt_errors()
+        if e:
+            w = list(w) + list(e)
         self.warnings = w