[Zope-Checkins] SVN: Zope/branches/2.12/ Don't nest block tags inside HTML <p> tags in zExceptions.ExceptionFormatter.

[Tres Seaver]

Log message for revision 112182:
  Don't nest block tags inside HTML <p> tags in zExceptions.ExceptionFormatter.
  
  LP #351006
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/zExceptions/ExceptionFormatter.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2010-05-08 03:56:47 UTC (rev 112181)
+++ Zope/branches/2.12/doc/CHANGES.rst	2010-05-08 04:44:43 UTC (rev 112182)
@@ -36,6 +36,9 @@
 Bugs Fixed
 ++++++++++
 
+- LP #351006:  Don't nest block tags inside HTML ``<p>`` tags in
+  ``zExceptions.ExceptionFormatter``.
+
 - LP #411837:  Handle resource files with ``.htm`` extention properly,
   as page template resources.
 

Modified: Zope/branches/2.12/src/zExceptions/ExceptionFormatter.py
===================================================================
--- Zope/branches/2.12/src/zExceptions/ExceptionFormatter.py	2010-05-08 03:56:47 UTC (rev 112181)
+++ Zope/branches/2.12/src/zExceptions/ExceptionFormatter.py	2010-05-08 04:44:43 UTC (rev 112182)
@@ -208,7 +208,7 @@
         return cgi.escape(s)
 
     def getPrefix(self):
-        return '<p>Traceback (innermost last):\r\n<ul>'
+        return '<p>Traceback (innermost last):</p>\r\n<ul>'
 
     def formatSupplementLine(self, line):
         return '<b>%s</b>' % self.escape(str(line))
@@ -223,7 +223,7 @@
         return '<li>%s</li>' % line
 
     def formatLastLine(self, exc_line):
-        return '</ul>%s</p>' % self.escape(exc_line)
+        return '</ul><p>%s</p>' % self.escape(exc_line)
 
     def formatExtraInfo(self, supplement):
         getInfo = getattr(supplement, 'getInfo', None)