[Checkins] SVN: zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/ <p> tags cannot contain <ul> tags.

[Tres Seaver]

Log message for revision 125026:
  <p> tags cannot contain <ul> tags.

Changed:
  U   zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/exceptionformatter.py
  U   zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/tests/test_exceptionformatter.py

-=-
Modified: zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/exceptionformatter.py
===================================================================
--- zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/exceptionformatter.py	2012-04-06 19:36:42 UTC (rev 125025)
+++ zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/exceptionformatter.py	2012-04-06 19:36:46 UTC (rev 125026)
@@ -216,7 +216,7 @@
         return cgi.escape(s)
 
     def getPrefix(self):
-        return '<p>Traceback (most recent call last):\r\n<ul>'
+        return '<p>Traceback (most recent call last):</p>\r\n<ul>'
 
     def formatSupplementLine(self, line):
         return '<b>%s</b>' % self.escape(str(line))
@@ -237,7 +237,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 format_exception(t, v, tb, limit=None, as_html=False,

Modified: zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/tests/test_exceptionformatter.py
===================================================================
--- zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/tests/test_exceptionformatter.py	2012-04-06 19:36:42 UTC (rev 125025)
+++ zope.exceptions/branches/tseaver-no_2to3/src/zope/exceptions/tests/test_exceptionformatter.py	2012-04-06 19:36:46 UTC (rev 125026)
@@ -399,7 +399,7 @@
     def test_getPrefix(self):
         fmt = self._makeOne()
         self.assertEqual(fmt.getPrefix(),
-                         '<p>Traceback (most recent call last):\r\n<ul>')
+                         '<p>Traceback (most recent call last):</p>\r\n<ul>')
 
 
 class Test_format_exception(unittest.TestCase):