From d5ec7c1ac38ecdf10cb260b65d2b60d0799591cd Mon Sep 17 00:00:00 2001 From: calvin Date: Wed, 30 Apr 2008 14:37:49 +0000 Subject: [PATCH] Encode error output to HTML charset git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3746 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/lc_cgi.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/linkcheck/lc_cgi.py b/linkcheck/lc_cgi.py index e0205471..9de754d5 100644 --- a/linkcheck/lc_cgi.py +++ b/linkcheck/lc_cgi.py @@ -65,7 +65,7 @@ def checkaccess (out=sys.stdout, hosts=None, servers=None, env=os.environ): os.environ.get('SERVER_ADDR') in servers: return True logit({}, env) - print_error(out, "Access denied") + print_error(out, u"Access denied") return False @@ -100,7 +100,7 @@ def checklink (out=sys.stdout, form=None, env=os.environ): except UnicodeError: logit({}, env) print_error(out, - "URL has unparsable domain name: %s" % sys.exc_info()[1]) + u"URL has unparsable domain name: %s" % sys.exc_info()[1]) return aggregate.urlqueue.put(url_data) linkcheck.director.check_urls(aggregate) @@ -162,7 +162,8 @@ def logit (form, env): def print_error (out, why): """Print standard error page.""" - out.write(_(""" + s = _(""" + LinkChecker Online Error
@@ -173,4 +174,5 @@ contains only these characters: A-Za-z0-9./_~-

Errors are logged.
-""") % why) +""") % why + out.write(s.encode('iso-8859-1', 'ignore'))