Commit 6de33787 authored by Tres Seaver's avatar Tres Seaver

Don't nest block tags inside HTML <p> tags in zExceptions.ExceptionFormatter.

LP #351006
parent cbee56f2
...@@ -36,6 +36,9 @@ Features Added ...@@ -36,6 +36,9 @@ Features Added
Bugs Fixed 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, - LP #411837: Handle resource files with ``.htm`` extention properly,
as page template resources. as page template resources.
......
...@@ -208,7 +208,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter): ...@@ -208,7 +208,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
return cgi.escape(s) return cgi.escape(s)
def getPrefix(self): def getPrefix(self):
return '<p>Traceback (innermost last):\r\n<ul>' return '<p>Traceback (innermost last):</p>\r\n<ul>'
def formatSupplementLine(self, line): def formatSupplementLine(self, line):
return '<b>%s</b>' % self.escape(str(line)) return '<b>%s</b>' % self.escape(str(line))
...@@ -223,7 +223,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter): ...@@ -223,7 +223,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
return '<li>%s</li>' % line return '<li>%s</li>' % line
def formatLastLine(self, exc_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): def formatExtraInfo(self, supplement):
getInfo = getattr(supplement, 'getInfo', None) getInfo = getattr(supplement, 'getInfo', None)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment