[Zope-Checkins] SVN: Zope/trunk/lib/python/ZPublisher/HTTPResponse.py Forward port fix for collector #1957 from 2.8 branch.
Log message for revision 40347:
Forward port fix for collector #1957 from 2.8 branch.
Changed:
U Zope/trunk/lib/python/ZPublisher/HTTPResponse.py
-=-
Modified: Zope/trunk/lib/python/ZPublisher/HTTPResponse.py
===
--- Zope/trunk/lib/python/ZPublisher/HTTPResponse.py2005-11-23 17:15:03 UTC
(rev 40346)
+++ Zope/trunk/lib/python/ZPublisher/HTTPResponse.py2005-11-23 17:15:47 UTC
(rev 40347)
@@ -599,43 +599,44 @@
def _error_html(self,title,body):
# XXX could this try to use standard_error_message somehow?
return ("""\
-
-
+
+
-
+
-
+
-
- Site Error
- An error was encountered while publishing this resource.
- """ + \
+
+ Site Error
+ An error was encountered while publishing this resource.
+ """ + \
"""
- %s
+ %s
%s""" %(title,body) + \
"""
-
+
- Troubleshooting Suggestions
+ Troubleshooting Suggestions
-
- The URL may be incorrect.
- The parameters passed to this resource may be incorrect.
- A resource that this resource relies on may be
- encountering an error.
-
+
+ The URL may be incorrect.
+ The parameters passed to this resource may be incorrect.
+ A resource that this resource relies on may be
+ encountering an error.
+
- For more detailed information about the error, please
+ For more detailed information about the error, please
refer to error log.
-
+
- If the error persists please contact the site maintainer.
+ If the error persists please contact the site maintainer.
Thank you for your patience.
-
-
-""")
+
+
+""")
+
def notFoundError(self,entry='Unknown'):
self.setStatus(404)
raise NotFound, self._error_html(
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py Forward port fix for collector #1957 from 2.8 branch.
Log message for revision 40345:
Forward port fix for collector #1957 from 2.8 branch.
Changed:
U Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py
-=-
Modified: Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py
===
--- Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py 2005-11-23
17:06:23 UTC (rev 40344)
+++ Zope/branches/2.9/lib/python/ZPublisher/HTTPResponse.py 2005-11-23
17:11:35 UTC (rev 40345)
@@ -599,43 +599,44 @@
def _error_html(self,title,body):
# XXX could this try to use standard_error_message somehow?
return ("""\
-
-
+
+
-
+
-
+
-
- Site Error
- An error was encountered while publishing this resource.
- """ + \
+
+ Site Error
+ An error was encountered while publishing this resource.
+ """ + \
"""
- %s
+ %s
%s""" %(title,body) + \
"""
-
+
- Troubleshooting Suggestions
+ Troubleshooting Suggestions
-
- The URL may be incorrect.
- The parameters passed to this resource may be incorrect.
- A resource that this resource relies on may be
- encountering an error.
-
+
+ The URL may be incorrect.
+ The parameters passed to this resource may be incorrect.
+ A resource that this resource relies on may be
+ encountering an error.
+
- For more detailed information about the error, please
+ For more detailed information about the error, please
refer to error log.
-
+
- If the error persists please contact the site maintainer.
+ If the error persists please contact the site maintainer.
Thank you for your patience.
-
-
-""")
+
+
+""")
+
def notFoundError(self,entry='Unknown'):
self.setStatus(404)
raise NotFound, self._error_html(
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/ Collector #1957: Made ZPublisher.HTTPResponse._error_html return conformant XHTML.
Log message for revision 40344:
Collector #1957: Made ZPublisher.HTTPResponse._error_html return conformant
XHTML.
Changed:
U Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
U Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py
-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-11-23 16:49:33 UTC
(rev 40343)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-11-23 17:06:23 UTC
(rev 40344)
@@ -26,6 +26,9 @@
Bugs Fixed
+ - Collector #1957: Made ZPublisher.HTTPResponse._error_html
+return conformant XHTML.
+
- Collector #1891: Backported changes to ZCatalog regression
tests, removing use of 'whrandom' (and its 'seed' function).
Modified: Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py
===
--- Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py
2005-11-23 16:49:33 UTC (rev 40343)
+++ Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py
2005-11-23 17:06:23 UTC (rev 40344)
@@ -599,43 +599,44 @@
def _error_html(self,title,body):
# XXX could this try to use standard_error_message somehow?
return ("""\
-
-
+
+
-
+
-
+
-
- Site Error
- An error was encountered while publishing this resource.
- """ + \
+
+ Site Error
+ An error was encountered while publishing this resource.
+ """ + \
"""
- %s
+ %s
%s""" %(title,body) + \
"""
-
+
- Troubleshooting Suggestions
+ Troubleshooting Suggestions
-
- The URL may be incorrect.
- The parameters passed to this resource may be incorrect.
- A resource that this resource relies on may be
- encountering an error.
-
+
+ The URL may be incorrect.
+ The parameters passed to this resource may be incorrect.
+ A resource that this resource relies on may be
+ encountering an error.
+
- For more detailed information about the error, please
+ For more detailed information about the error, please
refer to error log.
-
+
- If the error persists please contact the site maintainer.
+ If the error persists please contact the site maintainer.
Thank you for your patience.
-
-
-""")
+
+
+""")
+
def notFoundError(self,entry='Unknown'):
self.setStatus(404)
raise NotFound, self._error_html(
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/ZPublisher/tests/testPostTraversal.py Fix test breakage when run outside full Zope suite.
Log message for revision 40343: Fix test breakage when run outside full Zope suite. Changed: U Zope/trunk/lib/python/ZPublisher/tests/testPostTraversal.py -=- Modified: Zope/trunk/lib/python/ZPublisher/tests/testPostTraversal.py === --- Zope/trunk/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 16:49:07 UTC (rev 40342) +++ Zope/trunk/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 16:49:33 UTC (rev 40343) @@ -1,5 +1,6 @@ from unittest import TestCase, TestSuite, makeSuite, main +import Testing import Zope2 Zope2.startup() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/ZPublisher/tests/testPostTraversal.py Fix test breakage when run outside full Zope suite.
Log message for revision 40342: Fix test breakage when run outside full Zope suite. Changed: U Zope/branches/2.9/lib/python/ZPublisher/tests/testPostTraversal.py -=- Modified: Zope/branches/2.9/lib/python/ZPublisher/tests/testPostTraversal.py === --- Zope/branches/2.9/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 16:48:29 UTC (rev 40341) +++ Zope/branches/2.9/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 16:49:07 UTC (rev 40342) @@ -1,5 +1,6 @@ from unittest import TestCase, TestSuite, makeSuite, main +import Testing import Zope2 Zope2.startup() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/tests/testPostTraversal.py Fix test breakage when run outside full Zope suite.
Log message for revision 40341: Fix test breakage when run outside full Zope suite. Changed: U Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/tests/testPostTraversal.py -=- Modified: Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/tests/testPostTraversal.py === --- Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 15:50:07 UTC (rev 40340) +++ Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/tests/testPostTraversal.py 2005-11-23 16:48:29 UTC (rev 40341) @@ -1,5 +1,6 @@ from unittest import TestCase, TestSuite, makeSuite, main +import Testing import Zope2 Zope2.startup() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
