From 55dd81886abae1dde053451097ab4068c917ee87 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 22 Oct 2019 21:12:26 +0200 Subject: [PATCH] Web UI: Fix str vs bytes mess in error message handling Displaying the error message failed resulting in an empty page and a (hidden) trace back. Resolves: #180 --- scripts/boxesserver | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/boxesserver b/scripts/boxesserver index e5d2803..f803ecf 100755 --- a/scripts/boxesserver +++ b/scripts/boxesserver @@ -382,19 +382,19 @@ class BServer: def errorMessage(self, name, e, _): return [ - b""" + (""" - """, _("Error generating %s") % _(name).encode(), - b""" + """ + _("Error generating %s") % _(name) + + """ -

""" + _("An error occurred!") + "

", -u"".join(u"

%s

" % cgi.escape(s) for s in type(u"")(e).split(u"\n")).encode('utf-8'), -b""" +

""" + _("An error occurred!") + "

" + +"".join(u"

%s

" % cgi.escape(s) for s in type(u"")(e).split(u"\n")) + +""" -""" ] +""").encode("utf-8") ] def serveStatic(self, environ, start_response): filename = environ["PATH_INFO"][len("/static/"):]