[Zope-Checkins] SVN: Zope/branches/2.9/ Collector #2013: improved XHTML conformance of error messages

[Tres Seaver]

Log message for revision 41459:
  Collector #2013: improved XHTML conformance of error messages
  
  o Some of the error messages did not close '<p>' tags.
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.9/doc/CHANGES.txt	2006-01-27 01:39:54 UTC (rev 41458)
+++ Zope/branches/2.9/doc/CHANGES.txt	2006-01-27 01:40:29 UTC (rev 41459)
@@ -26,6 +26,9 @@
 
     Bugs fixed
 
+      - Collector #2013: improved XHTML conformance of error messages,
+        some of which did not close '<p>' tags.
+
       - Collector #1999: fixed broken FTP rename functionality
         (RNFR now returns 350 as status code instead 250)
 

Modified: Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py
===================================================================
--- Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py	2006-01-27 01:39:54 UTC (rev 41458)
+++ Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py	2006-01-27 01:40:29 UTC (rev 41459)
@@ -664,7 +664,7 @@
         raise NotFound, self._error_html(
             "Debugging Notice",
             "Zope has encountered a problem publishing your object.<p>"
-            "\n%s" % entry)
+            "\n%s</p>" % entry)
 
     def badRequestError(self,name):
         self.setStatus(400)
@@ -678,7 +678,7 @@
             "The parameter, <em>%s</em>, " % name +
             "was omitted from the request.<p>" +
             "Make sure to specify all required parameters, " +
-            "and try the request again."
+            "and try the request again.</p>"
             )
 
     def _unauthorized(self):
@@ -691,9 +691,9 @@
         m = "<strong>You are not authorized to access this resource.</strong>"
         if self.debug_mode:
             if self._auth:
-                m = m + '<p>\nUsername and password are not correct.'
+                m = m + '<p>\nUsername and password are not correct.</p>'
             else:
-                m = m + '<p>\nNo Authorization header found.'
+                m = m + '<p>\nNo Authorization header found.</p>'
         raise Unauthorized, m
 
     def exception(self, fatal=0, info=None,
@@ -783,7 +783,7 @@
         if fatal and t is SystemExit and v.code == 0:
             body = self.setBody(
                 (str(t),
-                 'Zope has exited normally.<p>' + self._traceback(t, v, tb)),
+                 'Zope has exited normally.<p>' + self._traceback(t, v, tb) + '</p>'),
                 is_error=1)
         else:
             try:
@@ -794,7 +794,8 @@
                 body = self.setBody(
                     (str(t),
                      'Sorry, a site error occurred.<p>'
-                     + self._traceback(t, v, tb)),
+                     + self._traceback(t, v, tb)
+                     + '</p>'),
                     is_error=1)
             elif self.isHTML(b):
                 # error is an HTML document, not just a snippet of html