Re-use `HTTPExcpeption.body_template` in httpexceptions middleware.

6d54e97b · Hanno Schlichting · 665b64e3 · 6d54e97b
Commit 6d54e97b authored Sep 08, 2016 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 31 deletions

src/ZPublisher/httpexceptions.py src/ZPublisher/httpexceptions.py +1 -31

No files found.
--- a/src/ZPublisher/httpexceptions.py
+++ b/src/ZPublisher/httpexceptions.py
@@ -17,36 +17,6 @@ from zExceptions import (
    InternalError,
 )

-ERROR_HTML = """\
-<!DOCTYPE html>
-<html>
-<head>
-<title>Site Error</title>
-<meta charset="utf-8" />
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Site Error</h2>
-<p>An error was encountered while publishing this resource.
-</p>
-<p><strong>Sorry, a site error occurred.</strong></p>
-
-%s
-<hr noshade="noshade"/>
-
-<p>Troubleshooting Suggestions</p>
-
-<ul>
-<li>The URL may be incorrect.</li>
-<li>The parameters passed to this resource may be incorrect.</li>
-<li>A resource that this resource relies on may be
-  encountering an error.</li>
-</ul>
-
-<p>If the error persists please contact the site maintainer.
-Thank you for your patience.
-</p>
-</body></html>"""
-

 class HTTPExceptionHandler(object):

@@ -64,7 +34,7 @@ class HTTPExceptionHandler(object):

    def catch_all_response(self, exc):
        response = InternalError()
-        response.setBody(ERROR_HTML % repr(exc))
+        response.detail = repr(exc)
        return response