From 074d61ff0548bde5c5c81196602160e0947fbdb9 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Jul 02 2020 08:28:55 +0000 Subject: PR#2342: fix simple_error_message encoding Merges #2342 https://pagure.io/koji/pull-request/2342 Fixes: #1977 https://pagure.io/koji/issue/1977 koji-web should log an error if it cannot read /etc/kojiweb/web.conf Fixes: #2341 https://pagure.io/koji/issue/2341 web: simple_error_message has wrong encoding for py3 --- diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py index b232ea1..9ed48f2 100644 --- a/www/kojiweb/wsgi_publisher.py +++ b/www/kojiweb/wsgi_publisher.py @@ -288,6 +288,7 @@ class Dispatcher(object): if err: result.append("

%s

\n" % err) result.append("\n") + result = [x.encode('utf-8') for x in result] length = sum([len(x) for x in result]) headers = [ ('Allow', 'GET, POST, HEAD'),