[Zope-Checkins] CVS: Packages/ZPublisher - HTTPResponse.py:1.48

Evan Simpson evan@zope.com
Tue, 7 Aug 2001 14:36:48 -0400


Update of /cvs-repository/Packages/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv486/ZPublisher

Modified Files:
	HTTPResponse.py 
Log Message:
Merge HTML tweaks from Zope-2_4-branch


=== Packages/ZPublisher/HTTPResponse.py 1.47 => 1.48 ===
         # XXX could this try to use standard_error_message somehow?
         return ("""\
-<HTML>
-<HEAD><TITLE>Site Error</TITLE></HEAD>
-<BODY>
-
 <TABLE BORDER="0" WIDTH="100%">
 <TR VALIGN="TOP">
 
@@ -535,10 +531,7 @@
   Thank you for your patience.
   </P>
 </TD></TR>
-</TABLE>
-
-</BODY>
-</HTML>""")
+</TABLE>""")
 
     def notFoundError(self,entry='Unknown'):
         self.setStatus(404)
@@ -546,7 +539,7 @@
             "Resource not found",
             "Sorry, the requested resource does not exist." +
             "<p>Check the URL and try again.</p>" +
-            "<p><b>Reason:</b> %s</p>" % self.quoteHTML(entry))
+            "<p><b>Resource:</b> %s</p>" % self.quoteHTML(entry))
 
     forbiddenError=notFoundError  # If a resource is forbidden,
                                   # why reveal that it exists?