From 2deec86163b1ce20b3af55dd8ab2e402a6a05e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Fri, 4 Mar 2016 08:56:30 +0100
Subject: [PATCH] fields: fix unhtmled_label to return a byte string (#10193)

---
 wcs/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wcs/fields.py b/wcs/fields.py
index 73ce1d1..41d4c6f 100644
--- a/wcs/fields.py
+++ b/wcs/fields.py
@@ -158,8 +158,9 @@ class Field(object):
 
     @property
     def unhtmled_label(self):
+        charset = get_publisher().site_charset
         return HTMLParser().unescape(unicode(
-            re.sub('<.*?>', ' ', self.label), get_publisher().site_charset)).strip()
+            re.sub('<.*?>', ' ', self.label), charset)).strip().encode(charset)
 
     def get_admin_attributes(self):
         return ['label', 'type']
-- 
2.7.0