From 1581471a70984619922f7d0f1d3c5d218cff1faa Mon Sep 17 00:00:00 2001 From: Quentin Smith Date: Tue, 29 Sep 2009 15:51:55 -0400 Subject: [PATCH] Use contact address from config on error page svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2694 --- code/main.py | 2 +- code/templates/error.mako | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/main.py b/code/main.py index 732b7a2..de0a739 100755 --- a/code/main.py +++ b/code/main.py @@ -76,7 +76,7 @@ class InvirtWeb(View): traceback = cherrypy.request.prev.params["traceback"] d = dict(op = op, user=username, fields=cherrypy.request.prev.params, errorMessage=str(err), stderr=emsg, traceback=traceback) - error_raw = cherrypy.tools.mako.callable.get_lookup(**cherrypy.tools.mako._merged_args()).get_template("/error_raw.mako") + error_raw = cherrypy.request.lookup.get_template("/error_raw.mako") details = error_raw.render(**d) exclude = config.web.errormail_exclude if username not in exclude and '*' not in exclude: diff --git a/code/templates/error.mako b/code/templates/error.mako index 51c6a65..1edb1b4 100644 --- a/code/templates/error.mako +++ b/code/templates/error.mako @@ -8,7 +8,7 @@ ERROR!

Uh-oh! We experienced an error. Sorry about that. We've gotten mail about it.

-

Feel free to poke us at xvm@mit.edu if this bug is +

Feel free to poke us at ${config.contact} if this bug is consistently biting you and we don't seem to be fixing it.

In case you're curious, the gory details are below.

-- 1.7.9.5