From 61714c2d198c37c801569bb31152b57f53660ef5 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Fri, 30 Aug 2013 20:25:39 +0400
Subject: [PATCH] Bug 96691 - Fix utf-8 error

---
 lib/viewvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/viewvc.py b/lib/viewvc.py
index 250ed32c..2b164659 100644
--- a/lib/viewvc.py
+++ b/lib/viewvc.py
@@ -5010,7 +5010,7 @@ def query_custispatcher(request, commits):
       except:
         raise
     r = '<hotfix name="bug'+'_'.join(extbugs)+'" for-versions="" bugs="'+' '.join(bugs)+'">\n\
-  <description>'+cgi.escape(ext_descs.rstrip())+'</description>\n\
+  <description>'+cgi.escape(ext_descs.rstrip().decode('utf-8'))+'</description>\n\
   <portion num="" repeatable="1" deploy-safety="dangerous">\n\
     '+r.rstrip().replace('\n', '\n    ')+'\n\
   </portion>\n\